From d177fe0369fed82559bcddae24874f16e56df546 Mon Sep 17 00:00:00 2001 From: devin chen Date: Wed, 3 Apr 2013 15:38:59 +0800 Subject: [PATCH] minor update --- app/assets/javascripts/orbitdesktop.js | 17 ++++++++++------- .../stylesheets/desktop/desktop-component.css | 3 ++- .../stylesheets/desktop/desktop-component.scss | 1 + app/assets/stylesheets/desktop/desktop-main.css | 2 ++ .../stylesheets/desktop/desktop-main.scss | 6 +++++- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index e6b6377a..deeb4831 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -1665,15 +1665,18 @@ var orbitDesktop = function(dom){ }; this.simple_drop_down = function(){ // simple dropdown menu - if( !$('.sdm').children('.sdm_o').length > 0 ){ - return; - } else { - $('.sdm').hover(function(){ - $(this).stop(1,1).addClass('thmc2 thmtxt'); - }, function(){ - $(this).stop(1,1).removeClass('thmc2 thmtxt'); + var $sdm = $('.sdm'); + if( $sdm.find('.sdm_o') ){ + $sdm.find('a').andSelf().on({ + mouseenter: function(){ + $(this).addClass('thmc2 thmtxt'); + }, + mouseleave: function(){ + $(this).removeClass('thmc2 thmtxt'); + } }); } + }; this.simple_tab = function(){ // tab diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css index d1005f65..682779b2 100644 --- a/app/assets/stylesheets/desktop/desktop-component.css +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -92,7 +92,8 @@ z-index: 9; left: 0; top: 60px; - font-size: 15px; } + font-size: 15px; + width: 120px; } .sdm_o li { border-top: solid 1px #f2f2f2; } .sdm_o li:first-child { diff --git a/app/assets/stylesheets/desktop/desktop-component.scss b/app/assets/stylesheets/desktop/desktop-component.scss index cd23492b..0344b52d 100644 --- a/app/assets/stylesheets/desktop/desktop-component.scss +++ b/app/assets/stylesheets/desktop/desktop-component.scss @@ -58,6 +58,7 @@ left: 0; top: 60px; font-size: 15px; + width: 120px; li { border-top: solid 1px #f2f2f2; diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index e029fab4..1e9a31e3 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -469,6 +469,8 @@ a:focus { margin: 0 12px 0 0; position: relative; z-index: 9; } + .dtitle .sdm_o { + width: auto; } .tile { display: block; diff --git a/app/assets/stylesheets/desktop/desktop-main.scss b/app/assets/stylesheets/desktop/desktop-main.scss index e5f15737..a727963f 100644 --- a/app/assets/stylesheets/desktop/desktop-main.scss +++ b/app/assets/stylesheets/desktop/desktop-main.scss @@ -446,7 +446,11 @@ a:focus { outline: none; } margin: 0 12px 0 0; position: relative; z-index: 9; + + .sdm_o { + width: auto; } +} .tile { display: block; width: 100%; @@ -454,7 +458,7 @@ a:focus { outline: none; } position: absolute; left: 0; top: 0; - } +} .widget.gs_w { cursor: move; }