From cc97e567b6caa84266cb345da97183de8c984d1a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 16 Mar 2016 15:17:08 -0700 Subject: [PATCH] [Frontend] Further style cleanups #689 #740 Tweaked scrollbar thumb color; Fixed color of icons in s-menu-btn menus, particularly for Snow theme; Removed commented code; --- .../general/res/sass/controls/_menus.scss | 17 ++++------------- .../themes/snow/res/sass/_constants.scss | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 12fea8c41f..d84dc4c032 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -51,9 +51,6 @@ .title-label { font-size: 1rem; } - //&:after { - // color: rgba($colorInvokeMenu, 0.5); - //} } .menu { @@ -113,10 +110,10 @@ .menu, .context-menu, -.super-menu { +.super-menu, +.s-menu-btn .menu { pointer-events: auto; ul li { - //padding-left: 25px; a { color: $colorMenuFg; } @@ -126,9 +123,6 @@ .type-icon { left: $interiorMargin; } - &:hover .icon { - //color: lighten($colorMenuIc, 5%); - } } } @@ -146,7 +140,7 @@ height: $d; width: $d; &:before { - font-size: 7px !important;// $d/2; + font-size: 7px !important; height: $d; width: $d; line-height: $d; @@ -173,7 +167,6 @@ .pane { box-sizing: border-box; &.left { - //@include test(); border-right: 1px solid pullForward($colorMenuBg, 10%); left: 0; padding-right: $interiorMargin; @@ -190,7 +183,6 @@ } } &.right { - //@include test(red); left: auto; right: 0; padding: $interiorMargin * 5; @@ -216,7 +208,6 @@ margin-bottom: 0.5em; } &.description { - //color: lighten($colorMenuBg, 30%); color: $colorCreateMenuText; font-size: 0.8em; line-height: 1.5em; @@ -258,4 +249,4 @@ left: auto; right: 0; width: auto; -} \ No newline at end of file +} diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 6283f1aedb..9206b3632b 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -174,7 +174,7 @@ $scrollbarTrackShdw: rgba(#000, 0.2) 0 1px 2px; $scrollbarTrackColorBg: rgba(#000, 0.2); $scrollbarThumbColor: darken($colorBodyBg, 50%); $scrollbarThumbColorHov: $colorKey; -$scrollbarThumbColorOverlay: darken($colorOvrBg, 15%); +$scrollbarThumbColorOverlay: darken($colorOvrBg, 50%); $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter