From 97b60c48b25145ce5cb3090a0f75b5ee436a1ee7 Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 10 May 2012 17:41:56 +0800 Subject: [PATCH] update --- app/assets/javascripts/orbitdesktop.js | 8 +++- app/assets/stylesheets/desktopmain.css | 61 +++++++++++++++++++------- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 3e9007fe..48bf2ef1 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -1040,6 +1040,7 @@ var orbitDesktop = function(dom){ e.parents('.overview').width( baseWidth * count ); + $('.tinycanvas') .tinyscrollbar({ axis: 'x'}) @@ -1106,7 +1107,7 @@ var orbitDesktop = function(dom){ }; this.simple_drop_down = function(){ // simple dropdown menu - if( !$('.sdm').children('.sdm_o') ){ + if( !$('.sdm').children('.sdm_o').length > 0 ){ return; } else { $('.sdm').hover(function(){ @@ -1114,6 +1115,11 @@ var orbitDesktop = function(dom){ }, function(){ $(this).stop(1,1).toggleClass('thmc2 thmtxt'); }); + $('.sdm').find('a').hover(function(){ + $(this).stop(1,1).toggleClass('thmc2 thmtxt'); + }, function(){ + $(this).stop(1,1).toggleClass('thmc2 thmtxt'); + }); } } o.initialize(); diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index d9823f5e..ff1428fc 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -249,7 +249,6 @@ a:focus { outline: none; } .sdm_o li:first-child { border: none; } .sdm_o a { display: block; } .sdm_o .admtxt { display: block; line-height: 36px; } -.sdm_o .admtxt:hover { background-color: #fcfcfc; } /* simple menu */ .s_menu { font-size: 15px; line-height: 36px; } @@ -480,6 +479,33 @@ a:focus { outline: none; } .s_grid_con .s_grid_5 { width: 340px; } .s_grid_con .s_grid_6 { width: 410px; } +/* simple slider */ +/*.s_slider { display: inline-block; float: none; vertical-align: middle; } +.s_slider > .s_grid { display: inline-block; float: none; vertical-align: middle; } +.s_slider_holder { + position: absolute; +} +.s_slider_c { + position: relative; + height: 6px; + background-color: #ddd; + margin-right: 5px; +} +.s_slider_c .ui-slider-handle { + position: absolute; + width: 10px; + height: 16px; + margin: -5px 0 0 0; + background-color: #333; +} +.s_slider_c .ui-slider-range { + position: absolute; + top: 0; + height: 100%; + background-color: red; + display: block; +}*/ + /* simple form */ .s_form { font-size: 15px; } @@ -543,21 +569,22 @@ a:focus { outline: none; } display: block; background-color: #fff; } - +.s_form.s_grid_con { width: 416px; } +.s_form .s_grid_row { width: 410px; } .s_form .s_grid_row .s_grid:first-child { margin-left: 0; } .s_form input[type=text].s_grid, .s_form input[type=passowrd].s_grid, .s_form textarea.s_grid, .s_form label.s_grid { float: none; display: inline-block; margin-left: 10px; } -.s_form input[type=text].s_grid_1, .s_form input[type=passowrd].s_grid_1, .s_form textarea.s_grid_1 { width: 40px; } -.s_form input[type=text].s_grid_2, .s_form input[type=passowrd].s_grid_2, .s_form textarea.s_grid_2 { width: 110px; } -.s_form input[type=text].s_grid_3, .s_form input[type=passowrd].s_grid_3, .s_form textarea.s_grid_3 { width: 180px; } -.s_form input[type=text].s_grid_4, .s_form input[type=passowrd].s_grid_4, .s_form textarea.s_grid_4 { width: 250px; } -.s_form input[type=text].s_grid_5, .s_form input[type=passowrd].s_grid_5, .s_form textarea.s_grid_5 { width: 320px; } -.s_form input[type=text].s_grid_6, .s_form input[type=passowrd].s_grid_6, .s_form textarea.s_grid_6 { width: 390px; } -.s_form select.s_grid_1 { width: 57px; } -.s_form select.s_grid_2 { width: 127px; } -.s_form select.s_grid_3 { width: 197px; } -.s_form select.s_grid_4 { width: 267px; } -.s_form select.s_grid_5 { width: 337px; } -.s_form select.s_grid_6 { width: 407px; } +.s_form input[type=text].s_grid_1, .s_form input[type=passowrd].s_grid_1, .s_form textarea.s_grid_1 { width: 46px; } +.s_form input[type=text].s_grid_2, .s_form input[type=passowrd].s_grid_2, .s_form textarea.s_grid_2 { width: 116px; } +.s_form input[type=text].s_grid_3, .s_form input[type=passowrd].s_grid_3, .s_form textarea.s_grid_3 { width: 186px; } +.s_form input[type=text].s_grid_4, .s_form input[type=passowrd].s_grid_4, .s_form textarea.s_grid_4 { width: 256px; } +.s_form input[type=text].s_grid_5, .s_form input[type=passowrd].s_grid_5, .s_form textarea.s_grid_5 { width: 326px; } +.s_form input[type=text].s_grid_6, .s_form input[type=passowrd].s_grid_6, .s_form textarea.s_grid_6 { width: 396px; } +.s_form select.s_grid_1 { width: 60px; } +.s_form select.s_grid_2 { width: 130px; } +.s_form select.s_grid_3 { width: 200px; } +.s_form select.s_grid_4 { width: 270px; } +.s_form select.s_grid_5 { width: 340px; } +.s_form select.s_grid_6 { width: 410px; } @@ -625,7 +652,7 @@ a:focus { outline: none; } /* Journal Papers */ #paper_list, #paper_add { height: 456px; } #paper_list .g_col { - width: 300px; + width: 410px; height: 456px; margin-left: 12px; padding-left: 12px; @@ -647,8 +674,8 @@ a:focus { outline: none; } } .list_item_action .icon-ok { visibility: hidden; } .list_item_action .item_check_status { outline: solid 1px #999; } -.list_item_action .icon-star-empty { color: #999; } -.list_item_action .icon-star { color: #faa732; } +.list_item_action .icon-star-empty { color: #999; font-size: 20px; } +.list_item_action .icon-star { color: #faa732; font-size: 20px; } .item_check_status:hover .icon-ok, .item_check_status.checked .icon-ok { visibility: visible; } /* Journal Paper Add */