diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9d3bd17d..583bb2bb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -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 diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb index 3d450a80..7bc3b0fd 100644 --- a/app/assets/javascripts/tracks.js.erb +++ b/app/assets/javascripts/tracks.js.erb @@ -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(); }); - diff --git a/app/assets/javascripts/tracks_pages.js b/app/assets/javascripts/tracks_pages.js index fbd5c0e4..70947be1 100644 --- a/app/assets/javascripts/tracks_pages.js +++ b/app/assets/javascripts/tracks_pages.js @@ -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("

"+message+"

"); diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index 79231107..3bb46e3c 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -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; diff --git a/vendor/assets/javascripts/niftycube.js b/vendor/assets/javascripts/niftycube.js deleted file mode 100644 index 4318297e..00000000 --- a/vendor/assets/javascripts/niftycube.js +++ /dev/null @@ -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;i0;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;imaxh) maxh=els[i].offsetHeight; - els[i].style.height="auto"; - } -for(i=0;i0){ - 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