From 95f1768fb7df26d405efa112c74c40eb16b30256 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 18 Feb 2016 13:10:54 -0800 Subject: [PATCH] [Frontend] Refactoring to use Victorizr instead of media queries open #639 open #683 open #169 Tweak to espresso tree view control color and hover color for espresso theme; reordered elements in _constants; --- .../commonUI/themes/espresso/res/css/theme-espresso.css | 6 +++--- platform/commonUI/themes/espresso/res/sass/_constants.scss | 4 ++-- platform/commonUI/themes/snow/res/sass/_constants.scss | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 27dccb41ca..3d9efa37f2 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -6091,7 +6091,7 @@ ul.tree { /* line 48, ../../../../general/res/sass/tree/_tree.scss */ .tree-item .view-control, .search-result-item .view-control { - color: rgba(255, 255, 255, 0.3); + color: #999; font-size: 0.75em; margin-right: 5px; height: 100%; @@ -6154,7 +6154,7 @@ ul.tree { /* line 84, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .view-control, .search-result-item.selected .view-control { - color: rgba(255, 255, 255, 0.3); } + color: #999; } /* line 87, ../../../../general/res/sass/tree/_tree.scss */ .tree-item.selected .t-object-label .t-item-icon, .search-result-item.selected .t-object-label .t-item-icon { @@ -6179,7 +6179,7 @@ ul.tree { /* line 113, ../../../../general/res/sass/tree/_tree.scss */ body.desktop .tree-item .view-control:hover, body.desktop .search-result-item .view-control:hover { - color: #ffc700 !important; } + color: #cccccc !important; } /* line 118, ../../../../general/res/sass/tree/_tree.scss */ body.desktop .tree-item:not(.selected):hover, body.desktop .search-result-item:not(.selected):hover { diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 5f9cb56fc0..6beba10d21 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -153,13 +153,13 @@ $colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); $colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%); -$colorItemTreeVCHover: $colorAlt1; $colorItemTreeFg: $colorBodyFg; $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: pullForward($colorBodyFg, 20%); $colorItemTreeEditingBg: #344154; $colorItemTreeEditingFg: $colorEditAreaFg; -$colorItemTreeVC: rgba(#fff, 0.3); +$colorItemTreeVC: $colorBodyFg; //rgba(#fff, 0.3); +$colorItemTreeVCHover: pullForward($colorItemTreeVC, 20%); $colorItemTreeSelectedVC: $colorItemTreeVC; $shdwItemTreeIcon: 0.6; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 2e5b020f9f..25eff7a9e0 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -153,13 +153,13 @@ $colorItemTreeHoverBg: rgba($colorBodyFg, 0.1); $colorItemTreeHoverFg: pullForward($colorBodyFg, 20%); $colorItemTreeIcon: $colorKey; $colorItemTreeIconHover: $colorItemTreeIcon; //pushBack($colorItemTreeIcon, 20%); -$colorItemTreeVCHover: $colorKey; $colorItemTreeFg: $colorBodyFg; $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: $colorBodyBg; $colorItemTreeEditingBg: #caf1ff; //#c6e3ff; $colorItemTreeEditingFg: $colorEditAreaFg; $colorItemTreeVC: $colorBodyFg; +$colorItemTreeVCHover: $colorKey; $colorItemTreeSelectedVC: $colorBodyBg; $shdwItemTreeIcon: none;