mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-22 05:50:47 +02:00
Use standard CSS for rounded corners
Remove Nifty Corners and prefixed CSS rules. Browser support of CSS3 border-radius is excellent by now.
This commit is contained in:
Dan Rice
parent
5718eac5c3
commit
e6761731d1
6 changed files with 4 additions and 339 deletions
|
|
@ -27,7 +27,6 @@
|
|||
//= require jquery.jeditable.mini
|
||||
//= require jquery.simulate.drag-sortable
|
||||
//= require jquery.truncator
|
||||
//= require niftycube
|
||||
//= require superfish
|
||||
//= require supersubs
|
||||
//= require swf_fu
|
||||
|
|
|
|||
|
|
@ -1144,8 +1144,6 @@ $(document).ready(function() {
|
|||
});
|
||||
}
|
||||
|
||||
TracksPages.setup_nifty_corners();
|
||||
|
||||
TodoItemsContainer.setup_container_toggles();
|
||||
|
||||
/* enable page specific behavior */
|
||||
|
|
@ -1158,4 +1156,3 @@ $(document).ready(function() {
|
|||
/* Gets called from all AJAX callbacks, too */
|
||||
enable_rich_interaction();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -24,15 +24,6 @@ var TracksPages = {
|
|||
$(selector).remove();
|
||||
});
|
||||
},
|
||||
setup_nifty_corners: function() {
|
||||
Nifty("div#recurring_new_container","normal");
|
||||
Nifty("div#context_new_container","normal");
|
||||
Nifty("div#feedlegend","normal");
|
||||
Nifty("div#feedicons-project","normal");
|
||||
Nifty("div#feedicons-context","normal");
|
||||
Nifty("div#todo_new_action_container","normal");
|
||||
Nifty("div#project_new_project_container","normal");
|
||||
},
|
||||
page_notify: function(type, message, fade_duration_in_sec) {
|
||||
var flash = $('div#message_holder');
|
||||
flash.html("<h4 id=\'flash\' class=\'alert "+type+"\'>"+message+"</h4>");
|
||||
|
|
|
|||
|
|
@ -315,8 +315,6 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
|
|||
margin: 0px 0px 15px 0px;
|
||||
background: #fff;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
}
|
||||
|
||||
.completed {
|
||||
|
|
@ -332,6 +330,7 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
|
|||
margin-bottom: 0px;
|
||||
color: #666;
|
||||
position:static;
|
||||
border-radius: 4px 4px 0 0;
|
||||
}
|
||||
|
||||
.container_toggle img {
|
||||
|
|
@ -761,10 +760,7 @@ The colour of the background gets progressively yellower with age */
|
|||
font-size: 12pt;
|
||||
margin: 10px 10px 0px 0px;
|
||||
height:26px;
|
||||
-moz-border-radius: 2px;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
|
||||
}
|
||||
|
||||
ul {
|
||||
|
|
@ -917,6 +913,7 @@ form {
|
|||
padding: 5px 10px;
|
||||
background-color: #000;
|
||||
color: #eee;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
#recurring_new_container img {
|
||||
|
|
@ -1016,6 +1013,7 @@ input, select, textarea {
|
|||
margin: 0px 0px 0px 60px;
|
||||
padding: 0px 0px 0px 5px;
|
||||
width: 70%;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.feed {
|
||||
|
|
@ -1150,6 +1148,7 @@ ul#prefs {list-style-type: disc; margin-left: 15px;}
|
|||
color: #666;
|
||||
padding: 5px 20px;
|
||||
text-align: left;
|
||||
border-radius: 5px;
|
||||
|
||||
h3, dl, dt, dd {
|
||||
display: inline;
|
||||
|
|
|
|||
286
vendor/assets/javascripts/niftycube.js
vendored
286
vendor/assets/javascripts/niftycube.js
vendored
|
|
@ -1,286 +0,0 @@
|
|||
/* Nifty Corners Cube - rounded corners with CSS and Javascript
|
||||
Copyright 2006 Alessandro Fulciniti (a.fulciniti@html.it)
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
var niftyOk=(document.getElementById && document.createElement && Array.prototype.push);
|
||||
|
||||
function strFind(str, what){
|
||||
return(str.indexOf(what)>=0 ? true : false);
|
||||
}
|
||||
|
||||
var oldonload=window.onload;
|
||||
if(typeof(NiftyLoad)!='function') NiftyLoad=function(){};
|
||||
if(typeof(oldonload)=='function')
|
||||
window.onload=function(){oldonload();NiftyLoad()};
|
||||
else window.onload=function(){NiftyLoad()};
|
||||
|
||||
function Nifty(selector,options){
|
||||
if(niftyOk==false) return;
|
||||
var i,v=selector.split(","),h=0;
|
||||
if(options==undefined) options="";
|
||||
if(strFind(options,"fixed-height"))
|
||||
h=getElementsBySelector(v[0])[0].offsetHeight;
|
||||
for(i=0;i<v.length;i++)
|
||||
Rounded(v[i],options);
|
||||
if(strFind(options,"height")) SameHeight(selector,h);
|
||||
}
|
||||
|
||||
function Rounded(selector,options){
|
||||
var i,top="",bottom="",v=new Array();
|
||||
if(options!=""){
|
||||
options=options.replace("left","tl bl");
|
||||
options=options.replace("right","tr br");
|
||||
options=options.replace("top","tr tl");
|
||||
options=options.replace("bottom","br bl");
|
||||
options=options.replace("transparent","alias");
|
||||
if(strFind(options,"tl")){
|
||||
top="both";
|
||||
if(!strFind(options,"tr")) top="left";
|
||||
}
|
||||
else if(strFind(options,"tr")) top="right";
|
||||
if(strFind(options,"bl")){
|
||||
bottom="both";
|
||||
if(!strFind(options,"br")) bottom="left";
|
||||
}
|
||||
else if(strFind(options,"br")) bottom="right";
|
||||
}
|
||||
if(top=="" && bottom=="" && !strFind(options,"none")){top="both";bottom="both";}
|
||||
v=getElementsBySelector(selector);
|
||||
for(i=0;i<v.length;i++){
|
||||
FixIE(v[i]);
|
||||
if(top!="") AddTop(v[i],top,options);
|
||||
if(bottom!="") AddBottom(v[i],bottom,options);
|
||||
}
|
||||
}
|
||||
|
||||
function AddTop(el,side,options){
|
||||
var d=CreateEl("b"),lim=4,border="",p,i,btype="r",bk,color;
|
||||
d.style.marginLeft="-"+getPadding(el,"Left")+"px";
|
||||
d.style.marginRight="-"+getPadding(el,"Right")+"px";
|
||||
if(strFind(options,"alias") || (color=getBk(el))=="transparent"){
|
||||
color="transparent";bk="transparent"; border=getParentBk(el);btype="t";
|
||||
}
|
||||
else{
|
||||
bk=getParentBk(el); border=Mix(color,bk);
|
||||
}
|
||||
d.style.background=bk;
|
||||
d.className="niftycorners";
|
||||
p=getPadding(el,"Top");
|
||||
if(strFind(options,"small")){
|
||||
d.style.marginBottom=(p-2)+"px";
|
||||
btype+="s"; lim=2;
|
||||
}
|
||||
else if(strFind(options,"big")){
|
||||
d.style.marginBottom=(p-10)+"px";
|
||||
btype+="b"; lim=8;
|
||||
}
|
||||
else d.style.marginBottom=(p-5)+"px";
|
||||
for(i=1;i<=lim;i++)
|
||||
d.appendChild(CreateStrip(i,side,color,border,btype));
|
||||
el.style.paddingTop="0";
|
||||
el.insertBefore(d,el.firstChild);
|
||||
}
|
||||
|
||||
function AddBottom(el,side,options){
|
||||
var d=CreateEl("b"),lim=4,border="",p,i,btype="r",bk,color;
|
||||
d.style.marginLeft="-"+getPadding(el,"Left")+"px";
|
||||
d.style.marginRight="-"+getPadding(el,"Right")+"px";
|
||||
if(strFind(options,"alias") || (color=getBk(el))=="transparent"){
|
||||
color="transparent";bk="transparent"; border=getParentBk(el);btype="t";
|
||||
}
|
||||
else{
|
||||
bk=getParentBk(el); border=Mix(color,bk);
|
||||
}
|
||||
d.style.background=bk;
|
||||
d.className="niftycorners";
|
||||
p=getPadding(el,"Bottom");
|
||||
if(strFind(options,"small")){
|
||||
d.style.marginTop=(p-2)+"px";
|
||||
btype+="s"; lim=2;
|
||||
}
|
||||
else if(strFind(options,"big")){
|
||||
d.style.marginTop=(p-10)+"px";
|
||||
btype+="b"; lim=8;
|
||||
}
|
||||
else d.style.marginTop=(p-5)+"px";
|
||||
for(i=lim;i>0;i--)
|
||||
d.appendChild(CreateStrip(i,side,color,border,btype));
|
||||
el.style.paddingBottom=0;
|
||||
el.appendChild(d);
|
||||
}
|
||||
|
||||
function CreateStrip(index,side,color,border,btype){
|
||||
var x=CreateEl("b");
|
||||
x.className=btype+index;
|
||||
x.style.backgroundColor=color;
|
||||
x.style.borderColor=border;
|
||||
if(side=="left"){
|
||||
x.style.borderRightWidth="0";
|
||||
x.style.marginRight="0";
|
||||
}
|
||||
else if(side=="right"){
|
||||
x.style.borderLeftWidth="0";
|
||||
x.style.marginLeft="0";
|
||||
}
|
||||
return(x);
|
||||
}
|
||||
|
||||
function CreateEl(x){
|
||||
return(document.createElement(x));
|
||||
}
|
||||
|
||||
function FixIE(el){
|
||||
if(el.currentStyle!=null && el.currentStyle.hasLayout!=null && el.currentStyle.hasLayout==false)
|
||||
el.style.display="inline-block";
|
||||
}
|
||||
|
||||
function SameHeight(selector,maxh){
|
||||
var i,v=selector.split(","),t,j,els=[],gap;
|
||||
for(i=0;i<v.length;i++){
|
||||
t=getElementsBySelector(v[i]);
|
||||
els=els.concat(t);
|
||||
}
|
||||
for(i=0;i<els.length;i++){
|
||||
if(els[i].offsetHeight>maxh) maxh=els[i].offsetHeight;
|
||||
els[i].style.height="auto";
|
||||
}
|
||||
for(i=0;i<els.length;i++){
|
||||
gap=maxh-els[i].offsetHeight;
|
||||
if(gap>0){
|
||||
t=CreateEl("b");t.className="niftyfill";t.style.height=gap+"px";
|
||||
nc=els[i].lastChild;
|
||||
if(nc.className=="niftycorners")
|
||||
els[i].insertBefore(t,nc);
|
||||
else els[i].appendChild(t);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getElementsBySelector(selector){
|
||||
var i,j,selid="",selclass="",tag=selector,tag2="",v2,k,f,a,s=[],objlist=[],c;
|
||||
if(strFind(selector,"#")){ //id selector like "tag#id"
|
||||
if(strFind(selector," ")){ //descendant selector like "tag#id tag"
|
||||
s=selector.split(" ");
|
||||
var fs=s[0].split("#");
|
||||
if(fs.length==1) return(objlist);
|
||||
f=document.getElementById(fs[1]);
|
||||
if(f){
|
||||
v=f.getElementsByTagName(s[1]);
|
||||
for(i=0;i<v.length;i++) objlist.push(v[i]);
|
||||
}
|
||||
return(objlist);
|
||||
}
|
||||
else{
|
||||
s=selector.split("#");
|
||||
tag=s[0];
|
||||
selid=s[1];
|
||||
if(selid!=""){
|
||||
f=document.getElementById(selid);
|
||||
if(f) objlist.push(f);
|
||||
return(objlist);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(strFind(selector,".")){ //class selector like "tag.class"
|
||||
s=selector.split(".");
|
||||
tag=s[0];
|
||||
selclass=s[1];
|
||||
if(strFind(selclass, " ")){ //descendant selector like tag1.classname tag2
|
||||
s=selclass.split(" ");
|
||||
selclass=s[0];
|
||||
tag2=s[1];
|
||||
}
|
||||
}
|
||||
var v=document.getElementsByTagName(tag); // tag selector like "tag"
|
||||
if(selclass==""){
|
||||
for(i=0;i<v.length;i++) objlist.push(v[i]);
|
||||
return(objlist);
|
||||
}
|
||||
for(i=0;i<v.length;i++){
|
||||
c=v[i].className.split(" ");
|
||||
for(j=0;j<c.length;j++){
|
||||
if(c[j]==selclass){
|
||||
if(tag2=="") objlist.push(v[i]);
|
||||
else{
|
||||
v2=v[i].getElementsByTagName(tag2);
|
||||
for(k=0;k<v2.length;k++) objlist.push(v2[k]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return(objlist);
|
||||
}
|
||||
|
||||
function getParentBk(x){
|
||||
var el=x.parentNode,c;
|
||||
while(el.tagName.toUpperCase()!="HTML" && (c=getBk(el))=="transparent")
|
||||
el=el.parentNode;
|
||||
if(c=="transparent") c="#FFFFFF";
|
||||
return(c);
|
||||
}
|
||||
|
||||
function getBk(x){
|
||||
var c=getStyleProp(x,"backgroundColor");
|
||||
if(c==null || c=="transparent" || strFind(c,"rgba(0, 0, 0, 0)"))
|
||||
return("transparent");
|
||||
if(strFind(c,"rgb")) c=rgb2hex(c);
|
||||
return(c);
|
||||
}
|
||||
|
||||
function getPadding(x,side){
|
||||
var p=getStyleProp(x,"padding"+side);
|
||||
if(p==null || !strFind(p, "px")) return(0);
|
||||
return(parseInt(p));
|
||||
}
|
||||
|
||||
function getStyleProp(x,prop){
|
||||
if(x.currentStyle)
|
||||
return(x.currentStyle[prop]);
|
||||
if(document.defaultView.getComputedStyle)
|
||||
return(document.defaultView.getComputedStyle(x,'')[prop]);
|
||||
return(null);
|
||||
}
|
||||
|
||||
function rgb2hex(value){
|
||||
var hex="",v,h,i;
|
||||
var regexp=/([0-9]+)[, ]+([0-9]+)[, ]+([0-9]+)/;
|
||||
var h=regexp.exec(value);
|
||||
for(i=1;i<4;i++){
|
||||
v=parseInt(h[i]).toString(16);
|
||||
if(v.length==1) hex+="0"+v;
|
||||
else hex+=v;
|
||||
}
|
||||
return("#"+hex);
|
||||
}
|
||||
|
||||
function Mix(c1,c2){
|
||||
var i,step1,step2,x,y,r=new Array(3);
|
||||
if(c1.length==4)step1=1;
|
||||
else step1=2;
|
||||
if(c2.length==4) step2=1;
|
||||
else step2=2;
|
||||
for(i=0;i<3;i++){
|
||||
x=parseInt(c1.substr(1+step1*i,step1),16);
|
||||
if(step1==1) x=16*x+x;
|
||||
y=parseInt(c2.substr(1+step2*i,step2),16);
|
||||
if(step2==1) y=16*y+y;
|
||||
r[i]=Math.floor((x*50+y*50)/100);
|
||||
r[i]=r[i].toString(16);
|
||||
if(r[i].length==1) r[i]="0"+r[i];
|
||||
}
|
||||
return("#"+r[0]+r[1]+r[2]);
|
||||
}
|
||||
35
vendor/assets/stylesheets/niftyCorners.css
vendored
35
vendor/assets/stylesheets/niftyCorners.css
vendored
|
|
@ -1,35 +0,0 @@
|
|||
/*Nifty Corners Cube CSS by Alessandro Fulciniti
|
||||
The following classes are added dinamically by javascript,
|
||||
and their use should be avoided in the markup */
|
||||
|
||||
b.niftycorners,b.niftyfill{display:block}
|
||||
b.niftycorners *{display:block;height: 1px;line-height:1px;font-size: 1px;
|
||||
overflow:hidden;border-style:solid;border-width: 0 1px}
|
||||
/*normal*/
|
||||
b.r1{margin: 0 3px;border-width: 0 2px}
|
||||
b.r2{margin: 0 2px}
|
||||
b.r3{margin: 0 1px}
|
||||
b.r4{height: 2px}
|
||||
b.rb1{margin: 0 8px;border-width:0 2px}
|
||||
b.rb2{margin: 0 6px;border-width:0 2px}
|
||||
b.rb3{margin: 0 5px}
|
||||
b.rb4{margin: 0 4px}
|
||||
b.rb5{margin: 0 3px}
|
||||
b.rb6{margin: 0 2px}
|
||||
b.rb7{margin: 0 1px;height:2px}
|
||||
b.rb8{margin: 0;height:2px}
|
||||
b.rs1{margin: 0 1px}
|
||||
/*transparent inside*/
|
||||
b.t1{border-width: 0 5px}
|
||||
b.t2{border-width: 0 3px}
|
||||
b.t3{border-width: 0 2px}
|
||||
b.t4{height: 2px}
|
||||
b.tb1{border-width: 0 10px}
|
||||
b.tb2{border-width: 0 8px}
|
||||
b.tb3{border-width: 0 6px}
|
||||
b.tb4{border-width: 0 5px}
|
||||
b.tb5{border-width: 0 4px}
|
||||
b.tb6{border-width: 0 3px}
|
||||
b.tb7{border-width: 0 2px;height:2px}
|
||||
b.tb8{border-width: 0 1px;height:2px}
|
||||
b.ts1{border-width: 0 2px}
|
||||
Loading…
Add table
Add a link
Reference in a new issue