From bd3e9fe4f687ef5046575f63ba894dd374f62349 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 29 Mar 2013 17:50:21 +0800 Subject: [PATCH 1/5] Fix js bug and asset url after merge --- app/assets/javascripts/orbitdesktop.js | 5 +++-- ...desktop-select2.css => desktop-select2.css.erb} | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) rename app/assets/stylesheets/desktop/{desktop-select2.css => desktop-select2.css.erb} (93%) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index f56314834..3a8ac950e 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -409,8 +409,9 @@ var orbitDesktop = function(dom){ x++; if(x == no_of_entries){ x = 0; - temp_div.append(column); - } + temp_div.append(column); + } + }); } total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null; break; diff --git a/app/assets/stylesheets/desktop/desktop-select2.css b/app/assets/stylesheets/desktop/desktop-select2.css.erb similarity index 93% rename from app/assets/stylesheets/desktop/desktop-select2.css rename to app/assets/stylesheets/desktop/desktop-select2.css.erb index 10b475b93..7d0c7d2e1 100644 --- a/app/assets/stylesheets/desktop/desktop-select2.css +++ b/app/assets/stylesheets/desktop/desktop-select2.css.erb @@ -65,7 +65,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 font-size: 1px; text-decoration: none; border: 0; - background: url("select2/select2.png") right top no-repeat; + background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; cursor: pointer; outline: 0; } @@ -119,7 +119,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 display: block; width: 100%; height: 100%; - background: url("select2/select2.png") no-repeat 0 1px; } + background: url(<%= asset_path "desktop/select2/select2.png" %>) no-repeat 0 1px; } .select2-search { display: inline-block; @@ -152,7 +152,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 margin-top: 4px; } .select2-search input.select2-active { - background: white image-url("select2-spinner.gif") no-repeat 100%; } + background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; } .select2-container-active .select2-choice, .select2-container-active .select2-choices { @@ -265,7 +265,7 @@ disabled look for disabled choices in the results dropdown display: none; } .select2-more-results.select2-active { - background: #f4f4f4 image-url("select2-spinner.gif") no-repeat 100%; } + background: #f4f4f4 image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; } .select2-more-results { background: #f4f4f4; @@ -327,7 +327,7 @@ disabled look for disabled choices in the results dropdown background: transparent !important; } .select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: white image-url("select2-spinner.gif") no-repeat 100% !important; } + background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100% !important; } .select2-default { color: #999999 !important; } @@ -363,7 +363,7 @@ disabled look for disabled choices in the results dropdown top: 4px; font-size: 1px; outline: none; - background: url("select2/select2.png") right top no-repeat; } + background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; } .select2-container-multi .select2-search-choice-close { left: 3px; } @@ -402,7 +402,7 @@ disabled look for disabled choices in the results dropdown /* Retina-ize icons */ @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { - background-image: url("select2/select2x2.png") !important; + background-image: url(<%= asset_path "desktop/select2/select2x2.png" %>) !important; background-repeat: no-repeat !important; background-size: 60px 40px !important; } From d2330d6e3e110481eca4e5c8d4f3bc8355d48fac Mon Sep 17 00:00:00 2001 From: devin Date: Mon, 1 Apr 2013 10:50:31 +0800 Subject: [PATCH 2/5] devin's new branch --- app/assets/images/desktop/select2/select2.png | Bin 613 -> 824 bytes app/assets/javascripts/orbitdesktop.js | 4 +- app/assets/javascripts/orbitdesktopAPI.js | 2 +- .../stylesheets/desktop/desktop-component.css | 89 ++-- .../desktop/desktop-component.scss | 102 ++--- .../stylesheets/desktop/desktop-main.css | 234 +++++----- .../stylesheets/desktop/desktop-main.scss | 314 +++++++------- .../desktop/desktop-select2.css.erb | 410 ------------------ .../stylesheets/desktop/desktop-select2.scss | 26 +- app/views/desktop/settings/sections.html.erb | 8 +- app/views/desktop/settings/themes.html.erb | 10 +- app/views/devise/registrations/edit.html.erb | 19 +- .../personal_journal/desktop/journal_pages.js | 1 + .../desktop/journal_pages_controller.rb | 8 +- .../desktop/journal_pages_helper.rb | 7 +- .../desktop/journal_pages/index.html.erb | 86 ++++ 16 files changed, 484 insertions(+), 836 deletions(-) delete mode 100644 app/assets/stylesheets/desktop/desktop-select2.css.erb create mode 100644 vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb diff --git a/app/assets/images/desktop/select2/select2.png b/app/assets/images/desktop/select2/select2.png index 1d804ffb99699b9e030f1010314de0970b5a000d..7f37862722193406922288260b839d0227a529f8 100755 GIT binary patch literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^Q9x|O!3HGn@SiaSQY^(zo*^7SP{WbZ0pxQQctjR6 zFmMZjFyp1Wb$@_@awV=2CBgY=CFO}lsSJ)O`AMk?Zka`?<@rU~#R|^Brh0~}UBIv1rTmSpDVDTHL^rZN~9>l>Nt8yb5Ue7n!Uz|`mI;uumf=j}|xY!OG1hW&yE z-MF(IUH>p{Gb>u!`maHwg8R`qd4bs+S@}z^GI!ff3=z{@ZzJHNEcK@OfxgE~H?^Za zkKUzyFS~owXV0DA2?}RUpVhf3f63uG!UG)Mm3J1o11g~%RNSn%N#RW zFPO8cX<1F0aMCzyllP=_rAd;yvX2AAq<8hHGOu_csClw&QVN5vY-hklR1uN!jyFY$pS5{?avBEWA*1E{7;CB-?4IW_(P<`%$Z*+U^-2 zW}ed)PRQyxXgPf<^F!7j-3-s~bWVHzvu@sV*I=C^-8SdH-+mOU`)6P2pU`XvMvDa* zud}sfZE2nf# zN_k=NLq7OS=AIq@dk-#3{CPGn{?|RHHJjcP?c|7^dTCDF(?2K@g&tECB@&4|~# zcTI&^L1}l(;YBw*Lrm_l+|%vMfB3pgMC(>@spp$d62dDoezfY#=h_^5@31J~;y$+h z8?N13%f4po`Ns5?^KT@s{S&r%v$(u5`$yFuPJ;u=2biWe*goj&c*8T--S}29dj-D@ zLs`T61I~MX*gh~b$UpUK-aSxwSujU2RWr0H$3APgg&ebxsLQ0P=2TPXGV_ literal 613 zcmV-r0-F7aP)#WY!I$JQV$)A5aAS1BM||2XVJl=+L1^1S1H% zM-&lx?NZpUrHhn>fk<>POqf2sh40}xxGZfc+t+#Eb(qHy9_3*1(U%t9t)QDnI#YAL(|ACV(>)>6WD-t!8tutHkdb^#3`HzoJG3A2@T`% zA|K@o*b!`R#(7)PWrMFn2))Ca3MR4(zaT`Zr61*kZK5NPnZwQszxh$fyv3?&4c>$q z2m=+yc0dRXRAsPDxF6sD;@rK4JGdR_``1S~o6Xi@2&aR6hcSrEp9HVRzEqVDqBn<1%hR=D4e1f^ra^A|34Cjc=Gny{F(o#MrvPYgZuTJOz(n)-F<| zj()qR;C={)N<0RRvDZ^@6ND+W*}gh-Lip(MDt!(zMSO)!j2j+*hxgzC-e3$@(O2p* zu;+gddm(cZwXTCLx*Ky4THOa*^b^F`woveIeCK^0aR|TJ00000NkvXXu0mjfA#WC6 diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 3a8ac950e..a216b8a28 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -837,8 +837,8 @@ var orbitDesktop = function(dom){ if(tile.data_category == "app") $li = $('

  • '+tile.title+'

    • '); - else - $li = $('
  • Loading

    '+tile.title+'

    • '); + else + $li = $('
  • Loading

    '+tile.title+'

    • '); row = row + y; diff --git a/app/assets/javascripts/orbitdesktopAPI.js b/app/assets/javascripts/orbitdesktopAPI.js index 0039ce3de..7f5f1f536 100644 --- a/app/assets/javascripts/orbitdesktopAPI.js +++ b/app/assets/javascripts/orbitdesktopAPI.js @@ -147,7 +147,7 @@ var orbitDesktopAPI = function(){ return; } } - var whtml =$('
    '); + var whtml =$('
    '); $(o.contentHolder).append(whtml); var parentwindow = $(o.contentHolder).find("div#app_frame_"+o.windowcounter); var app_holder_height = parentwindow.height() - 72; diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css index 9a1615f82..d1005f65f 100644 --- a/app/assets/stylesheets/desktop/desktop-component.css +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -93,19 +93,15 @@ left: 0; top: 60px; font-size: 15px; } - -.sdm_o li { - border-top: solid 1px #f2f2f2; } - -.sdm_o li:first-child { - border: none; } - -.sdm_o a { - display: block; } - -.sdm_o .admtxt { - display: block; - line-height: 36px; } + .sdm_o li { + border-top: solid 1px #f2f2f2; } + .sdm_o li:first-child { + border: none; } + .sdm_o a { + display: block; } + .sdm_o .admtxt { + display: block; + line-height: 36px; } /* simple dropdown menu with indicator */ .sdm_mdr .sdm_t { @@ -119,15 +115,12 @@ .s_menu { font-size: 15px; line-height: 36px; } - -.s_menu li { - border-top: solid 1px #dddddd; } - -.s_menu li:first-child { - border: none; } - -.s_menu a { - display: block; } + .s_menu li { + border-top: solid 1px #dddddd; } + .s_menu li:first-child { + border: none; } + .s_menu a { + display: block; } /* simple tabs */ .s_tab { @@ -197,7 +190,8 @@ .s_form input[type=text]:focus, .s_form input[type=password]:focus, .s_form textarea:focus { - background-color: #f7f7f7; } + background-color: #f7f7f7; + border-color: #c4c4c4; } .s_form textarea { resize: none; } .s_form textarea.full_height { @@ -250,27 +244,23 @@ line-height: 36px; position: relative; z-index: 9; } - -.toolbar .sdm, .toolbar .fn_g { - display: inline-block; - vertical-align: top; } - -.toolbar .sdm_o { - top: 36px; - background-color: #f0f0f0; } - -.toolbar button { - border: none; - outline: none; - padding: 0 16px; - margin: 0; - font-family: inherit; - font-size: 15px; - vertical-align: top; } - -.toolbar .fn_btn { - display: inline-block; - vertical-align: top; } + .toolbar .sdm, .toolbar .fn_g { + display: inline-block; + vertical-align: top; } + .toolbar .sdm_o { + top: 36px; + background-color: #f0f0f0; } + .toolbar button { + border: none; + outline: none; + padding: 0 16px; + margin: 0; + font-family: inherit; + font-size: 15px; + vertical-align: top; } + .toolbar .fn_btn { + display: inline-block; + vertical-align: top; } /* tiny scrollbar */ .tinycanvas { @@ -368,10 +358,7 @@ .tinycanvas:hover .scrollbar { visibility: visible; opacity: 1; } - -.toolbar + .tinycanvas, -.s_tab + .tinycanvas { - height: 480px; } - -#panel_r .tinycanvas { - padding: 12px 0; } + .toolbar + .tinycanvas, .s_tab + .tinycanvas { + height: 480px; } + #panel_r .tinycanvas { + padding: 12px 0; } diff --git a/app/assets/stylesheets/desktop/desktop-component.scss b/app/assets/stylesheets/desktop/desktop-component.scss index 37b203db3..cd23492b0 100644 --- a/app/assets/stylesheets/desktop/desktop-component.scss +++ b/app/assets/stylesheets/desktop/desktop-component.scss @@ -58,19 +58,20 @@ left: 0; top: 60px; font-size: 15px; + + li { + border-top: solid 1px #f2f2f2; + } + li:first-child { + border: none; + } + a { + display: block; + } + .admtxt { + display: block; + line-height: 36px; } -.sdm_o li { - border-top: solid 1px #f2f2f2; -} -.sdm_o li:first-child { - border: none; -} -.sdm_o a { - display: block; -} -.sdm_o .admtxt { - display: block; - line-height: 36px; } /* simple dropdown menu with indicator */ @@ -86,15 +87,16 @@ .s_menu { font-size: 15px; line-height: 36px; -} -.s_menu li { - border-top: solid 1px #ddd; -} -.s_menu li:first-child { - border: none; -} -.s_menu a { - display: block; + + li { + border-top: solid 1px #ddd; + } + li:first-child { + border: none; + } + a { + display: block; + } } /* simple tabs */ @@ -165,6 +167,7 @@ &:focus { background-color: lighten($gray, 10%); + border-color: darken($gray, 10%); } } textarea { @@ -228,27 +231,28 @@ line-height: 36px; position: relative; z-index: 9; -} -.toolbar .sdm, .toolbar .fn_g { - display: inline-block; - vertical-align: top; -} -.toolbar .sdm_o { - top: 36px; - background-color: #f0f0f0; -} -.toolbar button { - border: none; - outline: none; - padding: 0 16px; - margin: 0; - font-family: inherit; - font-size: 15px; - vertical-align: top; -} -.toolbar .fn_btn { - display: inline-block; - vertical-align: top; + + .sdm, .fn_g { + display: inline-block; + vertical-align: top; + } + .sdm_o { + top: 36px; + background-color: #f0f0f0; + } + button { + border: none; + outline: none; + padding: 0 16px; + margin: 0; + font-family: inherit; + font-size: 15px; + vertical-align: top; + } + .fn_btn { + display: inline-block; + vertical-align: top; + } } /* tiny scrollbar */ @@ -351,11 +355,11 @@ visibility: visible; opacity: 1; } -} -.toolbar + .tinycanvas, -.s_tab + .tinycanvas { - height: 480px; -} -#panel_r .tinycanvas { - padding: 12px 0; + .toolbar + &, + .s_tab + & { + height: 480px; + } + #panel_r & { + padding: 12px 0; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index 2894694ef..e029fab41 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -70,11 +70,14 @@ a:focus { .clear:after { display: table; width: 100%; - content: ''; } + content: ''; + clear: both; } .o-loading { font-size: 13px; font-weight: normal; } + .fullsize .o-loading { + padding: 12px; } .o-loading i { font-size: 20px; } @@ -507,7 +510,6 @@ a:focus { .theme_preview { width: 528px; - height: 150px; line-height: 36px; font-size: 15px; } @@ -518,6 +520,11 @@ a:focus { margin-right: 12px; } .theme_plate > div:first-child { margin-right: 48px; } + .theme_plate .g_sep { + margin-right: 0; } + +#color_input th { + vertical-align: bottom; } .stock_wallpaper .ssl_item { margin-bottom: 6px; } @@ -527,6 +534,11 @@ a:focus { font-weight: normal; line-height: 60px; text-align: left; } + .s_title.size_large { + font-size: 36px; } + .s_title.size_small { + font-size: 15px; + line-height: 2em; } .s_subtitle { font-size: 15px; @@ -560,8 +572,18 @@ a:focus { max-width: 340px; } .g_sep { - width: 11px; - border-left: solid 1px white; } + width: 12px; + border-left: solid 1px white; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } .grp { height: 528px; @@ -586,7 +608,6 @@ a:focus { /* list item */ .list_t_item { - /*padding: 2px;*/ overflow: hidden; } .list_t_title { @@ -607,118 +628,74 @@ a:focus { font-size: 11px; -webkit-text-size-adjust: none; } -/* Connection Page */ -#connection_setting { - height: 492px; } - -#connection_setting .s_form { - float: left; - margin: 0 12px 0 0; - padding-left: 24px; - height: 100%; - border-left: solid 1px #dddddd; } - -#connection_setting .s_form:first-child { - padding-left: 0; - border: none; } - -#connection_setting .s_form label { - line-height: 30px; } - -#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name { - display: inline-block; - vertical-align: middle; } - -#connection_setting .s_form .c_name { - padding: 0 12px; - font-size: 18px; } - -#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] { - width: 202px; } - -#connection_setting .setting_btn { - margin-left: 12px; } - -#connection_setting .setting_btn.disable { - background-color: #ddd; - cursor: default; } - -#connection_setting .c_status { - float: right; - padding: 6px; - background-color: #eee; - color: #ccc; - font-size: 9px; - font-weight: normal; - -webkit-text-size-adjust: none; - -webkit-transition: background-color 0.5s ease; - -moz-transition: background-color 0.5s ease; - transition: background-color 0.5s ease; } - -#connection_setting .c_status_on { - background-color: #51A351; - color: #fff; } - -#connection_setting .c_info { - padding: 7px 6px; - background-color: #fcfcfc; - cursor: default; - font-size: 18px; - font-weight: normal; } - /* Journal Papers */ [page-name="journal_p_list"] .list_t_item .inner { padding-left: 30px; } - [page-name="journal_p_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - -[page-name="journal_p_list"] .list_item_action a { - display: block; - width: 20px; - height: 20px; - line-height: 20px; - margin: 1px 1px 6px 1px; } - -[page-name="journal_p_list"] .list_item_action .icon-star-empty { - color: #999; - font-size: 20px; } - -[page-name="journal_p_list"] .list_item_action .icon-star { - color: #faa732; - font-size: 20px; } - -[page-name="journal_p_list"] .list_item_action .icon-check-empty { - color: #999; - font-size: 20px; } - -[page-name="journal_p_list"] .list_item_action .icon-check { - color: #333; - font-size: 20px; } - -[page-name="journal_p_list"] .list_t_item.file_view { - height: 148px; } - + [page-name="journal_p_list"] .list_item_action a { + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; } + [page-name="journal_p_list"] .list_item_action .icon-star-empty { + color: #999; + font-size: 20px; } + [page-name="journal_p_list"] .list_item_action .icon-star { + color: #faa732; + font-size: 20px; } + [page-name="journal_p_list"] .list_item_action .icon-check-empty { + color: #999; + font-size: 20px; } + [page-name="journal_p_list"] .list_item_action .icon-check { + color: #333; + font-size: 20px; } +[page-name="journal_p_list"] .file_view .list_t_des { + overflow: hidden; } [page-name="journal_p_list"] .file_view .file { - display: inline-block; - width: 62px; + float: left; + width: 120px; height: 50px; - text-align: center; } - -[page-name="journal_p_list"] .file_view .file:hover { - background-color: #ddd; } - -[page-name="journal_p_list"] .file_view .file img { - width: 24px; - display: block; - margin: 0 auto; - margin-top: 4px; } - -[page-name="journal_p_list"] .file_view .filetitle { - font-size: 11px; - -webkit-text-size-adjust: none; } + padding: 6px; + margin: 1px; + position: relative; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + [page-name="journal_p_list"] .file_view .file:hover { + background-color: #f7f7f7; } + [page-name="journal_p_list"] .file_view .file img { + width: 38px; + height: 38px; + position: absolute; + left: 6px; + top: 6px; } + [page-name="journal_p_list"] .file_view .file .filetitle { + display: block; + width: 100%; + height: 38px; + padding-left: 40px; + overflow: hidden; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } /* Journal Paper Add */ #paper_add .s_grid_con { @@ -727,27 +704,22 @@ a:focus { margin-left: 12px; padding-left: 12px; border-left: solid 1px #eeeeee; } - -#paper_add .s_grid_con:first-child { - margin-left: 0; - padding-left: 0; - border: none; } - + #paper_add .s_grid_con:first-child { + margin-left: 0; + padding-left: 0; + border: none; } #paper_add .f_w { width: 336px; } - #paper_add label { margin-right: 0; } /* Journal Journal list */ [page-name="journal_p_journal"] .datalist_item .inner { padding-left: 30px; } - [page-name="journal_p_journal"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="journal_p_journal"] .list_item_action i { color: #999; font-size: 20px; @@ -756,7 +728,6 @@ a:focus { height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="journal_p_journal"] .list_t_desc { font-family: Arial, sans-serif; font-size: 12px; @@ -765,21 +736,17 @@ a:focus { /* Journal Co-Author */ [page-name="journal_p_coauthor"] .list_t_item { height: 110px; } - [page-name="journal_p_coauthor"] .list_item_function a { display: inline-block; padding: 4px; font-family: Arial, sans-serif; font-size: 11px; -webkit-text-size-adjust: none; } - [page-name="journal_p_coauthor"] .info { font-family: Arial, sans-serif; } - [page-name="journal_p_coauthor"] .info li { margin-bottom: 8px; color: #999; } - [page-name="journal_p_coauthor"] .info .name { font-size: 18px; line-height: 24px; @@ -788,7 +755,6 @@ a:focus { /* Journal Co-Author Relationship*/ [page-name="journal_p_coauthor_relation"] .edit_co_author_relation { /*margin-left: -10px;*/ } - [page-name="journal_p_coauthor_relation"] .form_space { margin-bottom: 10px; font-size: 18px; @@ -809,18 +775,16 @@ a:focus { right: 0; bottom: 0; z-index: 12; } - -.app_frame .app_holder { - background-color: #fff; - position: absolute; - width: 100%; } - -.app_frame #header .icon-remove { - display: block; - float: right; - line-height: 60px; - font-size: 20px; - cursor: pointer; } + .app_frame .app_holder { + background-color: #fff; + position: absolute; + width: 100%; } + .app_frame #header .icon-remove { + display: block; + float: right; + line-height: 60px; + font-size: 20px; + cursor: pointer; } /*Tooltip popup */ .desktop_toolpopup { diff --git a/app/assets/stylesheets/desktop/desktop-main.scss b/app/assets/stylesheets/desktop/desktop-main.scss index 6e8890fb0..e5f15737f 100644 --- a/app/assets/stylesheets/desktop/desktop-main.scss +++ b/app/assets/stylesheets/desktop/desktop-main.scss @@ -66,11 +66,15 @@ a:focus { outline: none; } display: table; width: 100%; content: ''; + clear: both; } .o-loading { font-size: 13px; font-weight: normal; + .fullsize & { + padding: 12px; + } i { font-size: 20px; } @@ -484,7 +488,6 @@ a:focus { outline: none; } } .theme_preview { width: 528px; - height: 150px; line-height: 36px; font-size: 15px; } @@ -498,6 +501,12 @@ a:focus { outline: none; } > div:first-child { margin-right: 48px; } + .g_sep { + margin-right: 0; + } +} +#color_input th { + vertical-align: bottom } .stock_wallpaper { .ssl_item { @@ -510,6 +519,14 @@ a:focus { outline: none; } font-weight: normal; line-height: 60px; text-align: left; + + &.size_large { + font-size: 36px; + } + &.size_small { + font-size: 15px; + line-height: 2em; + } } .s_subtitle { font-size: 15px; @@ -546,9 +563,9 @@ a:focus { outline: none; } max-width: 340px; } .g_sep { - width: 11px; - border-left: - solid 1px #fff; + width: 12px; + border-left: solid 1px #fff; + @include box-sizing; } @@ -572,7 +589,7 @@ a:focus { outline: none; } } /* list item */ -.list_t_item { /*padding: 2px;*/ overflow: hidden; } +.list_t_item { overflow: hidden; } .list_t_title { margin-bottom: 6px; color: #333; @@ -592,155 +609,145 @@ a:focus { outline: none; } -webkit-text-size-adjust: none; } -/* Connection Page */ -#connection_setting { height: 492px; } -#connection_setting .s_form { - float: left; - margin: 0 12px 0 0; - padding-left: 24px; - height: 100%; - border-left: solid 1px #ddd; -} -#connection_setting .s_form:first-child { padding-left: 0; border: none; } -#connection_setting .s_form label { line-height: 30px; } -#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name { - display: inline-block; - vertical-align: middle; -} -#connection_setting .s_form .c_name { padding: 0 12px; font-size: 18px; } -#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] { width: 202px; } -#connection_setting .setting_btn { margin-left: 12px; } -#connection_setting .setting_btn.disable { background-color: #ddd; cursor: default; } -#connection_setting .c_status { - float: right; - padding: 6px; - background-color: #eee; - color: #ccc; - font-size: 9px; - font-weight: normal; - -webkit-text-size-adjust: none; - @include transition-type("background-color",0.5); -} -#connection_setting .c_status_on { background-color: #51A351; color: #fff; } -#connection_setting .c_info { - padding: 7px 6px; - background-color: #fcfcfc; - cursor: default; - font-size: 18px; - font-weight: normal; -} - /* Journal Papers */ -[page-name="journal_p_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="journal_p_list"] .list_item_action { - font-size: 12px; - float: left; - margin-left: -30px; -} -[page-name="journal_p_list"] .list_item_action a { - display: block; - width: 20px; - height: 20px; - line-height: 20px; - margin: 1px 1px 6px 1px; -} -[page-name="journal_p_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } -[page-name="journal_p_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } -[page-name="journal_p_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } -[page-name="journal_p_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } +[page-name="journal_p_list"] { + .list_t_item .inner { padding-left: 30px; } + .list_item_action { + font-size: 12px; + float: left; + margin-left: -30px; + + a { + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; + } + .icon-star-empty { color: #999; font-size: 20px; } + .icon-star { color: #faa732; font-size: 20px; } + .icon-check-empty { color: #999; font-size: 20px; } + .icon-check { color: #333; font-size: 20px; } + } + + .file_view { + .list_t_des { + overflow: hidden; + } + .file { + float: left; + width: 120px; + height: 50px; + padding: 6px; + margin: 1px; + position: relative; + @include box-sizing; -[page-name="journal_p_list"] .list_t_item.file_view { - height: 148px; -} -[page-name="journal_p_list"] .file_view .file { - display: inline-block; - width: 62px; - height: 50px; - text-align: center; -} -[page-name="journal_p_list"] .file_view .file:hover { - background-color: #ddd; -} -[page-name="journal_p_list"] .file_view .file img { - width: 24px; - display: block; - margin: 0 auto; - margin-top: 4px; -} -[page-name="journal_p_list"] .file_view .filetitle { - font-size: 11px; - -webkit-text-size-adjust: none; + &:hover { + background-color: lighten($gray, 10%); + } + img { + width: 38px; + height: 38px; + position: absolute; + left: 6px; + top: 6px; + } + .filetitle { + display: block; + width: 100%; + height: 38px; + padding-left: 40px; + overflow: hidden; + @include box-sizing; + } + } + } } /* Journal Paper Add */ -#paper_add .s_grid_con { - float: left; - height: 456px; - margin-left: 12px; - padding-left: 12px; - border-left: solid 1px #eee; +#paper_add { + .s_grid_con { + float: left; + height: 456px; + margin-left: 12px; + padding-left: 12px; + border-left: solid 1px #eee; + + &:first-child { + margin-left: 0; + padding-left: 0; + border: none; + } + } + .f_w { width: 336px; } + label { margin-right: 0; } } -#paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; } -#paper_add .f_w { width: 336px; } -#paper_add label { margin-right: 0; } /* Journal Journal list */ -[page-name="journal_p_journal"] .datalist_item .inner { - padding-left: 30px; -} -[page-name="journal_p_journal"] .list_item_action { - font-size: 12px; - float: left; - margin-left: -30px; -} -[page-name="journal_p_journal"] .list_item_action i { - color: #999; - font-size: 20px; - display: block; - width: 20px; - height: 20px; - line-height: 20px; - margin: 1px 1px 6px 1px; -} -[page-name="journal_p_journal"] .list_t_desc { - font-family: Arial, sans-serif; - font-size: 12px; - color: #999; +[page-name="journal_p_journal"] { + + .datalist_item .inner { + padding-left: 30px; + } + .list_item_action { + font-size: 12px; + float: left; + margin-left: -30px; + } + .list_item_action i { + color: #999; + font-size: 20px; + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; + } + .list_t_desc { + font-family: Arial, sans-serif; + font-size: 12px; + color: #999; + } } /* Journal Co-Author */ -[page-name="journal_p_coauthor"] {} -[page-name="journal_p_coauthor"] .list_t_item { - height: 110px; -} -[page-name="journal_p_coauthor"] .list_item_function {} -[page-name="journal_p_coauthor"] .list_item_function a { - display: inline-block; - padding: 4px; - font-family: Arial, sans-serif; - font-size: 11px; - -webkit-text-size-adjust: none; -} -[page-name="journal_p_coauthor"] .info { - font-family: Arial, sans-serif; -} -[page-name="journal_p_coauthor"] .info li { - margin-bottom: 8px; - color: #999; -} -[page-name="journal_p_coauthor"] .info .name { - font-size: 18px; - line-height: 24px; - color: #333; +[page-name="journal_p_coauthor"] { + .list_t_item { + height: 110px; + } + .list_item_function {} + .list_item_function a { + display: inline-block; + padding: 4px; + font-family: Arial, sans-serif; + font-size: 11px; + -webkit-text-size-adjust: none; + } + .info { + font-family: Arial, sans-serif; + } + .info li { + margin-bottom: 8px; + color: #999; + } + .info .name { + font-size: 18px; + line-height: 24px; + color: #333; + } } + /* Journal Co-Author Relationship*/ -[page-name="journal_p_coauthor_relation"] .edit_co_author_relation { - /*margin-left: -10px;*/ -} -[page-name="journal_p_coauthor_relation"] .form_space { - margin-bottom: 10px; - font-size: 18px; - font-family: Arial, sans-serif; +[page-name="journal_p_coauthor_relation"]{ + .edit_co_author_relation { + /*margin-left: -10px;*/ + } + .form_space { + margin-bottom: 10px; + font-size: 18px; + font-family: Arial, sans-serif; + } } /* Journal New Co-Author */ #new_co_author label { @@ -759,18 +766,19 @@ a:focus { outline: none; } right: 0; bottom: 0; z-index: 12; -} -.app_frame .app_holder { - background-color: #fff; - position: absolute; - width: 100%; -} -.app_frame #header .icon-remove { - display: block; - float: right; - line-height: 60px; - font-size: 20px; - cursor: pointer; + + .app_holder { + background-color: #fff; + position: absolute; + width: 100%; + } + #header .icon-remove { + display: block; + float: right; + line-height: 60px; + font-size: 20px; + cursor: pointer; + } } /*Tooltip popup */ diff --git a/app/assets/stylesheets/desktop/desktop-select2.css.erb b/app/assets/stylesheets/desktop/desktop-select2.css.erb deleted file mode 100644 index 7d0c7d2e1..000000000 --- a/app/assets/stylesheets/desktop/desktop-select2.css.erb +++ /dev/null @@ -1,410 +0,0 @@ -/* -Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 -*/ -.select2-container { - overflow: hidden; - display: inline-block; - /* inline-block for ie7 */ - zoom: 1; - *display: inline; - vertical-align: top; } - -.select2-container, -.select2-drop, -.select2-search, -.select2-search input { - -webkit-box-sizing: border-box; - /* webkit */ - -khtml-box-sizing: border-box; - /* konqueror */ - -moz-box-sizing: border-box; - /* firefox */ - -ms-box-sizing: border-box; - /* ie */ - box-sizing: border-box; - /* css3 */ } - -.select2-container .select2-choice { - display: block; - height: 30px; - padding: 0 0 0 8px; - overflow: hidden; - position: relative; - border: 1px solid #dddddd; - white-space: nowrap; - line-height: 30px; - color: #444; - text-decoration: none; - background-color: #fff; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } - -.select2-container.select2-drop-above .select2-choice { - border-bottom-color: #dddddd; } - -.select2-container .select2-choice span { - margin-right: 26px; - display: block; - overflow: hidden; - white-space: nowrap; - -ms-text-overflow: ellipsis; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; } - -.select2-container .select2-choice abbr { - display: block; - width: 12px; - height: 12px; - position: absolute; - right: 26px; - top: 8px; - font-size: 1px; - text-decoration: none; - border: 0; - background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; - cursor: pointer; - outline: 0; } - -.select2-container .select2-choice abbr:hover { - background-position: right -11px; - cursor: pointer; } - -.select2-drop-mask { - position: absolute; - left: 0; - top: 0; - z-index: 9998; - opacity: 0; } - -.select2-drop { - width: 100%; - margin-top: -1px; - position: absolute; - z-index: 9999; - top: 100%; - background: #fff; - color: #000; - border: 1px solid #dddddd; - border-top: 0; } - -.select2-drop.select2-drop-above { - margin-top: 1px; - border-top: 1px solid #dddddd; - border-bottom: 0; } - -.select2-container .select2-choice div { - display: block; - width: 20px; - height: 100%; - position: absolute; - right: 0; - top: 0; - background: #ccc; - -webkit-box-sizing: border-box; - /* webkit */ - -khtml-box-sizing: border-box; - /* konqueror */ - -moz-box-sizing: border-box; - /* firefox */ - -ms-box-sizing: border-box; - /* ie */ - box-sizing: border-box; - /* css3 */ } - -.select2-container .select2-choice div b { - display: block; - width: 100%; - height: 100%; - background: url(<%= asset_path "desktop/select2/select2.png" %>) no-repeat 0 1px; } - -.select2-search { - display: inline-block; - width: 100%; - min-height: 26px; - margin: 0; - padding-left: 4px; - padding-right: 4px; - position: relative; - z-index: 10000; - white-space: nowrap; } - -.select2-search-hidden { - display: block; - position: absolute; - left: -10000px; } - -.select2-search input { - width: 100%; - height: auto !important; - min-height: 26px; - padding: 4px 20px 4px 5px; - margin: 0; - outline: 0; - font-family: sans-serif; - font-size: 1em; - border: 1px solid #dddddd; } - -.select2-drop.select2-drop-above .select2-search input { - margin-top: 4px; } - -.select2-search input.select2-active { - background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; } - -.select2-container-active .select2-choice, -.select2-container-active .select2-choices { - outline: none; } - -.select2-dropdown-open .select2-choice { - border-bottom-color: transparent; - background-color: #eee; } - -.select2-dropdown-open .select2-choice div { - background: transparent; - border-left: none; - filter: none; } - -.select2-dropdown-open .select2-choice div b { - background-position: -18px 1px; } - -/* results */ -.select2-results { - max-height: 200px; - padding: 0 0 0 4px; - margin: 4px 4px 4px 0; - font-size: 13px; - position: relative; - overflow-x: hidden; - overflow-y: auto; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } - -.select2-results ul.select2-result-sub { - margin: 0; } - -.select2-results ul.select2-result-sub > li .select2-result-label { - padding-left: 20px; } - -.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { - padding-left: 40px; } - -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { - padding-left: 60px; } - -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { - padding-left: 80px; } - -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { - padding-left: 100px; } - -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { - padding-left: 110px; } - -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { - padding-left: 120px; } - -.select2-results li { - list-style: none; - display: list-item; - background-image: none; } - -.select2-results li.select2-result-with-children > .select2-result-label { - font-weight: bold; } - -.select2-results .select2-result-label { - padding: 4px 6px; - margin: 0; - cursor: pointer; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } - -.select2-results .select2-highlighted { - background: #666; - color: #fff; } - -.select2-results li em { - background: #feffde; - font-style: normal; } - -.select2-results .select2-highlighted em { - background: transparent; } - -.select2-results .select2-highlighted ul { - background: white; - color: #000; } - -.select2-results .select2-no-results, -.select2-results .select2-searching, -.select2-results .select2-selection-limit { - background: #f4f4f4; - padding: 4px 7px; - font-weight: normal; - display: list-item; } - -/* -disabled look for disabled choices in the results dropdown -*/ -.select2-results .select2-disabled.select2-highlighted { - color: #666; - background: #f4f4f4; - display: list-item; - cursor: default; } - -.select2-results .select2-disabled { - background: #f4f4f4; - display: list-item; - cursor: default; } - -.select2-results .select2-selected { - display: none; } - -.select2-more-results.select2-active { - background: #f4f4f4 image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; } - -.select2-more-results { - background: #f4f4f4; - display: list-item; } - -/* disabled styles */ -.select2-container.select2-container-disabled .select2-choice { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #dddddd; - cursor: default; } - -.select2-container.select2-container-disabled .select2-choice div { - background-color: #f4f4f4; - background-image: none; - border-left: 0; } - -.select2-container.select2-container-disabled .select2-choice abbr { - display: none; } - -/* multiselect */ -.select2-container-multi .select2-choices { - height: auto !important; - height: 1%; - margin: 0; - padding: 0; - position: relative; - border: 1px solid #dddddd; - cursor: text; - overflow: hidden; - background-color: #fff; } - -.select2-locked { - padding: 3px 5px 3px 5px !important; } - -.select2-container-multi .select2-choices { - min-height: 26px; } - -.select2-container-multi.select2-container-active .select2-choices { - outline: none; } - -.select2-container-multi .select2-choices li { - float: left; - list-style: none; } - -.select2-container-multi .select2-choices .select2-search-field { - margin: 0; - padding: 0; - white-space: nowrap; } - -.select2-container-multi .select2-choices .select2-search-field input { - padding: 5px; - height: 30px; - font-family: sans-serif; - font-size: 100%; - color: #666; - outline: 0; - border: 0; - background: transparent !important; } - -.select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100% !important; } - -.select2-default { - color: #999999 !important; } - -.select2-container-multi .select2-choices .select2-search-choice { - padding: 3px 5px 3px 18px; - margin: 3px 0 3px 5px; - position: relative; - line-height: 13px; - color: #333; - cursor: default; - border: 1px solid #dddddd; - background-color: #e4e4e4; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } - -.select2-container-multi .select2-choices .select2-search-choice span { - cursor: default; } - -.select2-container-multi .select2-choices .select2-search-choice-focus { - background: #d4d4d4; } - -.select2-search-choice-close { - display: block; - width: 12px; - height: 13px; - position: absolute; - right: 3px; - top: 4px; - font-size: 1px; - outline: none; - background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; } - -.select2-container-multi .select2-search-choice-close { - left: 3px; } - -.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { - background-position: right -11px; } - -.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { - background-position: right -11px; } - -/* disabled styles */ -.select2-container-multi.select2-container-disabled .select2-choices { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #dddddd; - cursor: default; } - -.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { - padding: 3px 5px 3px 5px; - border: 1px solid #dddddd; - background-image: none; - background-color: #f4f4f4; } - -.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { - display: none; } - -/* end multiselect */ -.select2-result-selectable .select2-match, -.select2-result-unselectable .select2-match { - text-decoration: underline; } - -.select2-offscreen { - position: absolute; - left: -10000px; } - -/* Retina-ize icons */ -@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { - .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { - background-image: url(<%= asset_path "desktop/select2/select2x2.png" %>) !important; - background-repeat: no-repeat !important; - background-size: 60px 40px !important; } - - .select2-search input { - background-position: 100% -21px !important; } } diff --git a/app/assets/stylesheets/desktop/desktop-select2.scss b/app/assets/stylesheets/desktop/desktop-select2.scss index 230f0d17e..66d01e723 100644 --- a/app/assets/stylesheets/desktop/desktop-select2.scss +++ b/app/assets/stylesheets/desktop/desktop-select2.scss @@ -86,8 +86,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 position: absolute; z-index: 9999; top: 100%; - - background: #fff; + background-color: $gray; color: #000; border: 1px solid $gray; border-top: 0; @@ -101,12 +100,12 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 .select2-container .select2-choice div { display: block; - width: 20px; + width: 21px; height: 100%; position: absolute; right: 0; top: 0; - background: #ccc; + border-left: solid 1px $gray; @include box-sizing; } @@ -114,7 +113,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 display: block; width: 100%; height: 100%; - background: url('select2/select2.png') no-repeat 0 1px; + background: url('select2/select2.png') no-repeat 0 50%; } .select2-search { @@ -167,16 +166,15 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 .select2-dropdown-open .select2-choice { border-bottom-color: transparent; - background-color: #eee; } .select2-dropdown-open .select2-choice div { - background: transparent; - border-left: none; + background-color: $gray; + // border-left: none; filter: none; } .select2-dropdown-open .select2-choice div b { - background-position: -18px 1px; + background-position: -20px 50%; } /* results */ @@ -377,11 +375,11 @@ disabled look for disabled choices in the results dropdown .select2-search-choice-close { display: block; - width: 12px; - height: 13px; + width: 10px; + height: 10px; position: absolute; right: 3px; - top: 4px; + top: 5px; font-size: 1px; outline: none; background: url('select2/select2.png') right top no-repeat; @@ -392,10 +390,10 @@ disabled look for disabled choices in the results dropdown } .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { - background-position: right -11px; + background-position: right -20px; } .select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { - background-position: right -11px; + background-position: right -20px; } /* disabled styles */ diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index f568336ad..cfaa1ed75 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -2,10 +2,10 @@
    Section Names
      -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
    sample desciption
    diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb index e4a1b853f..f3fe933a7 100644 --- a/app/views/desktop/settings/themes.html.erb +++ b/app/views/desktop/settings/themes.html.erb @@ -21,7 +21,7 @@
    Theme Text1
    -
    +
    Theme Text2
    Theme Text
    @@ -30,10 +30,10 @@
    - - - - + + + +
    Theme ColorLine ColorText ColorBackground ColorTheme ColorLine ColorText ColorBackground Color
    diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index f370c8610..ea8966dd6 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -2,17 +2,22 @@
    Password Managment
    <%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
      -
    • <%= f.label :current_password %> - <%= f.password_field :current_password %>
      • +
    • + <%= f.label :current_password, :class => 's_grid s_grid_4' %> + <%= f.password_field :current_password, :class => 's_grid s_grid_8' %> +
      • -
    • <%= f.label :password %> - <%= f.password_field :password %>
      • +
    • + <%= f.label :password, :class => 's_grid s_grid_4' %> + <%= f.password_field :password, :class => 's_grid s_grid_8' %> +
      • -
    • <%= f.label :password_confirmation %> - <%= f.password_field :password_confirmation %>
      • +
    • + <%= f.label :password_confirmation, :class => 's_grid s_grid_4' %> + <%= f.password_field :password_confirmation, :class => 's_grid s_grid_8' %> +
    <%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh1 hp" %>
    - <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js index fb378e35f..35e920592 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js @@ -13,6 +13,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // var bindHandlers = function(){ // to bind handlers for list page o.simple_drop_down(); } + bindHandlers(); var bindSecondaryHandlers = function(){ $("#journal_p div#paper_list a.icon-check-empty").click(function(){ diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb index 04b437d85..a3a688fc1 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb @@ -6,9 +6,13 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr page = params[:page] page ||= 1 - @per_column = 5 - if @view_by == "abstract" + case @view_by + when "abstract" @per_column = 1 + when "file" + @per_column = 2 + else + @per_column = 4 end if @view_by.nil? diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb index d70bbb490..7da71ad8c 100644 --- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb +++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view}_view" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -69,14 +69,15 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper content_tag(:span, file.title, :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.title) }.inject(:+) end def check_file_type file if not file.nil? file_type = MIME::Types.type_for(file).first.to_s.split("/")[1] - file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png" + file_type = "/assets/ft-icons/#{file_type}/#{file_type}-sm-32_32.png" else file_type = "" end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb new file mode 100644 index 000000000..0a4699d07 --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb @@ -0,0 +1,86 @@ +
    +
    +
    +
    + +
    +
    +
    +
    More
    +
    + +
    +
    +
    +
    Tag
    +
    + +
    +
    +
    +
    Status
    +
    + +
    +
    +
    +
    View
    +
    +
      +
    • <%= link_to "Journal", panel_personal_journal_desktop_journal_pages_path + "?view=journal_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • +
    • <%= link_to "Title", panel_personal_journal_desktop_journal_pages_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • +
    • <%= link_to "File", panel_personal_journal_desktop_journal_pages_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • +
    • <%= link_to "Keywords", panel_personal_journal_desktop_journal_pages_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • +
    • <%= link_to "Abstract", panel_personal_journal_desktop_journal_pages_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • +
    +
    +
    +
    +
    Share
    +
    + +
    +
    +
    +
    New Share
    +
    + +
    +
    +
    +
    +
    +
    +
    + <% @writing_journals.each do |w| %> + <%= publication_record w, @view_by%> + <% end %> +
    + + From 350c68611c6056e1635279252ce6ce052bd07767 Mon Sep 17 00:00:00 2001 From: devin chen Date: Tue, 2 Apr 2013 12:02:19 +0800 Subject: [PATCH 3/5] starting new branch ( add rules in .gitignore for SASS cache folder ) --- .gitignore | 5 +- Gemfile.lock | 19 +- .../stylesheets/desktop/desktop-select2.css | 408 ++++++++++++++++++ config/mongoid.yml | 2 +- 4 files changed, 416 insertions(+), 18 deletions(-) create mode 100644 app/assets/stylesheets/desktop/desktop-select2.css diff --git a/.gitignore b/.gitignore index d72a48344..1e08bdffb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,7 @@ uploads/**/* *.swp *.pid -*.lck \ No newline at end of file +*.lck + +.sass-cache/* +*.supported \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index b104ef3ec..e8f070d7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,6 @@ GEM execjs coffee-script-source (1.4.0) columnize (0.3.6) - curb (0.8.3) database_cleaner (0.9.1) debug_inspector (0.0.2) debugger (1.2.4) @@ -128,13 +127,6 @@ GEM multi_json (>= 1.3) rack-oauth2 (>= 0.14.4) tzinfo - feedzirra (0.0.24) - activesupport (>= 2.3.8) - builder (>= 2.1.2) - curb (>= 0.2.3) - loofah (>= 0.3.1) - nokogiri (> 0.0.0) - sax-machine (>= 0.0.12) ffi (1.4.0) haml (3.1.8) highline (1.6.15) @@ -149,8 +141,6 @@ GEM jquery-rails railties (>= 3.1.0) json (1.7.7) - loofah (1.2.1) - nokogiri (>= 1.4.4) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -285,10 +275,8 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sax-machine (0.1.0) - nokogiri (> 0.0.0) - select2-rails (3.3.0) - sass-rails (~> 3.2) + select2-rails (3.3.1) + sass-rails (>= 3.2) thor (~> 0.14) selenium-webdriver (2.30.0) childprocess (>= 0.2.5) @@ -368,7 +356,6 @@ DEPENDENCIES factory_girl_rails faker fb_graph - feedzirra impressionist! jquery-rails (= 2.1.4) jquery-ui-rails @@ -400,7 +387,7 @@ DEPENDENCIES rspec-rails (~> 2.0) rubyzip sass-rails - select2-rails + select2-rails (= 3.3.1) shoulda-matchers simplecov sinatra diff --git a/app/assets/stylesheets/desktop/desktop-select2.css b/app/assets/stylesheets/desktop/desktop-select2.css new file mode 100644 index 000000000..3703a42bb --- /dev/null +++ b/app/assets/stylesheets/desktop/desktop-select2.css @@ -0,0 +1,408 @@ +/* +Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 +*/ +.select2-container { + overflow: hidden; + display: inline-block; + /* inline-block for ie7 */ + zoom: 1; + *display: inline; + vertical-align: top; } + +.select2-container, +.select2-drop, +.select2-search, +.select2-search input { + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + +.select2-container .select2-choice { + display: block; + height: 30px; + padding: 0 0 0 8px; + overflow: hidden; + position: relative; + border: 1px solid #dddddd; + white-space: nowrap; + line-height: 30px; + color: #444; + text-decoration: none; + background-color: #fff; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.select2-container.select2-drop-above .select2-choice { + border-bottom-color: #dddddd; } + +.select2-container .select2-choice span { + margin-right: 26px; + display: block; + overflow: hidden; + white-space: nowrap; + -ms-text-overflow: ellipsis; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; } + +.select2-container .select2-choice abbr { + display: block; + width: 12px; + height: 12px; + position: absolute; + right: 26px; + top: 8px; + font-size: 1px; + text-decoration: none; + border: 0; + background: url("select2/select2.png") right top no-repeat; + cursor: pointer; + outline: 0; } + +.select2-container .select2-choice abbr:hover { + background-position: right -11px; + cursor: pointer; } + +.select2-drop-mask { + position: absolute; + left: 0; + top: 0; + z-index: 9998; + opacity: 0; } + +.select2-drop { + width: 100%; + margin-top: -1px; + position: absolute; + z-index: 9999; + top: 100%; + background-color: #dddddd; + color: #000; + border: 1px solid #dddddd; + border-top: 0; } + +.select2-drop.select2-drop-above { + margin-top: 1px; + border-top: 1px solid #dddddd; + border-bottom: 0; } + +.select2-container .select2-choice div { + display: block; + width: 21px; + height: 100%; + position: absolute; + right: 0; + top: 0; + border-left: solid 1px #dddddd; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + +.select2-container .select2-choice div b { + display: block; + width: 100%; + height: 100%; + background: url("select2/select2.png") no-repeat 0 50%; } + +.select2-search { + display: inline-block; + width: 100%; + min-height: 26px; + margin: 0; + padding-left: 4px; + padding-right: 4px; + position: relative; + z-index: 10000; + white-space: nowrap; } + +.select2-search-hidden { + display: block; + position: absolute; + left: -10000px; } + +.select2-search input { + width: 100%; + height: auto !important; + min-height: 26px; + padding: 4px 20px 4px 5px; + margin: 0; + outline: 0; + font-family: sans-serif; + font-size: 1em; + border: 1px solid #dddddd; } + +.select2-drop.select2-drop-above .select2-search input { + margin-top: 4px; } + +.select2-search input.select2-active { + background: white image-url("select2-spinner.gif") no-repeat 100%; } + +.select2-container-active .select2-choice, +.select2-container-active .select2-choices { + outline: none; } + +.select2-dropdown-open .select2-choice { + border-bottom-color: transparent; } + +.select2-dropdown-open .select2-choice div { + background-color: #dddddd; + filter: none; } + +.select2-dropdown-open .select2-choice div b { + background-position: -20px 50%; } + +/* results */ +.select2-results { + max-height: 200px; + padding: 0 0 0 4px; + margin: 4px 4px 4px 0; + font-size: 13px; + position: relative; + overflow-x: hidden; + overflow-y: auto; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } + +.select2-results ul.select2-result-sub { + margin: 0; } + +.select2-results ul.select2-result-sub > li .select2-result-label { + padding-left: 20px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 40px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 60px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 80px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 100px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 110px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 120px; } + +.select2-results li { + list-style: none; + display: list-item; + background-image: none; } + +.select2-results li.select2-result-with-children > .select2-result-label { + font-weight: bold; } + +.select2-results .select2-result-label { + padding: 4px 6px; + margin: 0; + cursor: pointer; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.select2-results .select2-highlighted { + background: #666; + color: #fff; } + +.select2-results li em { + background: #feffde; + font-style: normal; } + +.select2-results .select2-highlighted em { + background: transparent; } + +.select2-results .select2-highlighted ul { + background: white; + color: #000; } + +.select2-results .select2-no-results, +.select2-results .select2-searching, +.select2-results .select2-selection-limit { + background: #f4f4f4; + padding: 4px 7px; + font-weight: normal; + display: list-item; } + +/* +disabled look for disabled choices in the results dropdown +*/ +.select2-results .select2-disabled.select2-highlighted { + color: #666; + background: #f4f4f4; + display: list-item; + cursor: default; } + +.select2-results .select2-disabled { + background: #f4f4f4; + display: list-item; + cursor: default; } + +.select2-results .select2-selected { + display: none; } + +.select2-more-results.select2-active { + background: #f4f4f4 image-url("select2-spinner.gif") no-repeat 100%; } + +.select2-more-results { + background: #f4f4f4; + display: list-item; } + +/* disabled styles */ +.select2-container.select2-container-disabled .select2-choice { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #dddddd; + cursor: default; } + +.select2-container.select2-container-disabled .select2-choice div { + background-color: #f4f4f4; + background-image: none; + border-left: 0; } + +.select2-container.select2-container-disabled .select2-choice abbr { + display: none; } + +/* multiselect */ +.select2-container-multi .select2-choices { + height: auto !important; + height: 1%; + margin: 0; + padding: 0; + position: relative; + border: 1px solid #dddddd; + cursor: text; + overflow: hidden; + background-color: #fff; } + +.select2-locked { + padding: 3px 5px 3px 5px !important; } + +.select2-container-multi .select2-choices { + min-height: 26px; } + +.select2-container-multi.select2-container-active .select2-choices { + outline: none; } + +.select2-container-multi .select2-choices li { + float: left; + list-style: none; } + +.select2-container-multi .select2-choices .select2-search-field { + margin: 0; + padding: 0; + white-space: nowrap; } + +.select2-container-multi .select2-choices .select2-search-field input { + padding: 5px; + height: 30px; + font-family: sans-serif; + font-size: 100%; + color: #666; + outline: 0; + border: 0; + background: transparent !important; } + +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: white image-url("select2-spinner.gif") no-repeat 100% !important; } + +.select2-default { + color: #999999 !important; } + +.select2-container-multi .select2-choices .select2-search-choice { + padding: 3px 5px 3px 18px; + margin: 3px 0 3px 5px; + position: relative; + line-height: 13px; + color: #333; + cursor: default; + border: 1px solid #dddddd; + background-color: #e4e4e4; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.select2-container-multi .select2-choices .select2-search-choice span { + cursor: default; } + +.select2-container-multi .select2-choices .select2-search-choice-focus { + background: #d4d4d4; } + +.select2-search-choice-close { + display: block; + width: 10px; + height: 10px; + position: absolute; + right: 3px; + top: 5px; + font-size: 1px; + outline: none; + background: url("select2/select2.png") right top no-repeat; } + +.select2-container-multi .select2-search-choice-close { + left: 3px; } + +.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { + background-position: right -20px; } + +.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { + background-position: right -20px; } + +/* disabled styles */ +.select2-container-multi.select2-container-disabled .select2-choices { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #dddddd; + cursor: default; } + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { + padding: 3px 5px 3px 5px; + border: 1px solid #dddddd; + background-image: none; + background-color: #f4f4f4; } + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { + display: none; } + +/* end multiselect */ +.select2-result-selectable .select2-match, +.select2-result-unselectable .select2-match { + text-decoration: underline; } + +.select2-offscreen { + position: absolute; + left: -10000px; } + +/* Retina-ize icons */ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { + background-image: url("select2/select2x2.png") !important; + background-repeat: no-repeat !important; + background-size: 60px 40px !important; } + + .select2-search input { + background-position: 100% -21px !important; } } diff --git a/config/mongoid.yml b/config/mongoid.yml index ac9bf5577..2fa55a361 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -1,5 +1,5 @@ defaults: &defaults - host: 192.168.1.105 + host: localhost # slaves: # - host: slave1.local port: 27017 From 2f0533db2d8ab1beaf9d6a448c07b7f51928fc92 Mon Sep 17 00:00:00 2001 From: devin chen Date: Wed, 3 Apr 2013 15:03:05 +0800 Subject: [PATCH 4/5] minor update --- app/assets/javascripts/orbitdesktop.js | 13 ++++--------- app/assets/stylesheets/desktop/desktop-select2.css | 3 ++- app/assets/stylesheets/desktop/desktop-select2.scss | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index a216b8a28..7dff0a05d 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -837,8 +837,8 @@ var orbitDesktop = function(dom){ if(tile.data_category == "app") $li = $('

  • '+tile.title+'

    • '); - else - $li = $('
  • Loading

    '+tile.title+'

    • '); + else + $li = $('
  • Loading

    '+tile.title+'

    • '); row = row + y; @@ -1641,14 +1641,9 @@ var orbitDesktop = function(dom){ return; } else { $('.sdm').hover(function(){ - $(this).stop(1,1).toggleClass('thmc2 thmtxt'); + $(this).stop(1,1).addClass('thmc2 thmtxt'); }, 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'); + $(this).stop(1,1).removeClass('thmc2 thmtxt'); }); } }; diff --git a/app/assets/stylesheets/desktop/desktop-select2.css b/app/assets/stylesheets/desktop/desktop-select2.css index 3703a42bb..7f3d39444 100644 --- a/app/assets/stylesheets/desktop/desktop-select2.css +++ b/app/assets/stylesheets/desktop/desktop-select2.css @@ -395,7 +395,8 @@ disabled look for disabled choices in the results dropdown .select2-offscreen { position: absolute; - left: -10000px; } + left: -10000px; + top: 0; } /* Retina-ize icons */ @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { diff --git a/app/assets/stylesheets/desktop/desktop-select2.scss b/app/assets/stylesheets/desktop/desktop-select2.scss index 66d01e723..17c90ef72 100644 --- a/app/assets/stylesheets/desktop/desktop-select2.scss +++ b/app/assets/stylesheets/desktop/desktop-select2.scss @@ -425,6 +425,7 @@ disabled look for disabled choices in the results dropdown .select2-offscreen { position: absolute; left: -10000px; + top: 0; } /* Retina-ize icons */ From 3d7b54df1cd416239c49639a7c0f5d3bc9a9bd0c Mon Sep 17 00:00:00 2001 From: devin chen Date: Wed, 3 Apr 2013 15:38:59 +0800 Subject: [PATCH 5/5] 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 7dff0a05d..ae208287d 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -1637,15 +1637,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 d1005f65f..682779b2d 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 cd23492b0..0344b52d1 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 e029fab41..1e9a31e3b 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 e5f15737f..a727963f3 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; }