From 2ebed9e44ac9845759238b466023d20465abaf79 Mon Sep 17 00:00:00 2001 From: devin Date: Fri, 20 Apr 2012 09:45:40 +0800 Subject: [PATCH] javascript update --- app/assets/javascripts/orbitdesktop.js | 7 ++++--- app/assets/stylesheets/desktopmain.css | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index bbf2a5f8..b56e384b 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -363,10 +363,10 @@ var orbitDesktop = function(dom){ $("div#sections #group_wrapper .grp").sortable({ start:function(){ slabel = $(this).siblings('.section_label'); - slabel.find('li:hidden').fadeIn(500); + slabel.find('li:hidden').stop(1,1).fadeIn(500); }, stop:function(){ - slabel.find('li:not(:nth-child(1))').fadeOut(500); + slabel.find('li:not(:nth-child(1))').stop(1,1).fadeOut(500); } }); $("div#sections .section_label li:not(:nth-child(1))").droppable({ @@ -387,6 +387,7 @@ var orbitDesktop = function(dom){ o.desktopData["home"]=""; } } + $(this).find('span.tile').addClass('op06',400); }, over:function(){ $(this).find('span.tile').removeClass('op06'); @@ -417,7 +418,7 @@ var orbitDesktop = function(dom){ $group = $('
'); for(x=0;x<4;x++){ if(x==0){ - $li = $('
  • '+o.sectionList[z].name+'
  • '); + $li = $('
  • '+o.sectionList[z].name+'
  • '); $group.find("ul.section_grp").append($li); } if(z!=x){ diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index f67b0de4..eb21719a 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -153,6 +153,9 @@ a:focus { outline: none; } width: 132px; height:516px; } +.section_label li { font-size: 15px; } +.section_label li:first-child { font-size: 21px; } + .appname { font-size: 15px;