From 06b091100947a17f29b82f92bf0fa38735eaabac Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 31 Aug 2016 00:00:33 +0200 Subject: don't use selected_fg_color in weird places --- common/gnome-shell/3.14/sass/_colors.scss | 9 ++++++++- common/gnome-shell/3.14/sass/_common.scss | 28 ++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) (limited to 'common/gnome-shell/3.14/sass') diff --git a/common/gnome-shell/3.14/sass/_colors.scss b/common/gnome-shell/3.14/sass/_colors.scss index 47daa0f..8d3a5f2 100644 --- a/common/gnome-shell/3.14/sass/_colors.scss +++ b/common/gnome-shell/3.14/sass/_colors.scss @@ -8,7 +8,7 @@ $bg_color: if($variant =='light', #F5F6F7, #383C4A); $fg_color: if($variant =='light', #5c616c, #D3DAE3); $selected_fg_color: #ffffff; -$selected_bg_color: #5294E2; +$selected_bg_color: #5294e2; $selected_borders_color: darken($selected_bg_color, 20%); $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); @@ -18,11 +18,18 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%)); $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); +$selection_mode_fg: $selected_fg_color; $warning_color: #F27835; $error_color: #FC4138; +$warning_fg_color: white; +$error_fg_color: white; $success_color: #73d216; $destructive_color: #F04A50; $suggested_color: #4DADD4; +$destructive_fg_color: white; +$suggested_fg_color: white; + +$drop_target_color: #F08437; //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 002938f..4bf7d46 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -30,6 +30,7 @@ $font-family: Futura Bk bt, Cantarell, Sans-Serif; $_bubble_bg_color: opacify($osd_bg_color,0.25); $_bubble_fg_color: $osd_fg_color; $_bubble_borders_color: transparentize($osd_fg_color,0.8); +$_shell_fg_color: white; stage { font-family: $font-family; @@ -370,17 +371,17 @@ StScrollBar { // Shutdown Button .modal-dialog-button:last-child { - color: $selected_fg_color; + color: $destructive_fg_color; background-color: $destructive_color; border-color: $destructive_color; &:hover { - color: $selected_fg_color; + color: $destructive_fg_color; background-color: lighten($destructive_color, 9%); border-color: lighten($destructive_color, 9%); } &:active { - color: $selected_fg_color; + color: $destructive_fg_color; background-color: darken($destructive_color, 5%); border-color: darken($destructive_color, 5%); } @@ -662,7 +663,7 @@ StScrollBar { min-width: 64px; min-height: 64px; - color: $selected_fg_color; + color: $_shell_fg_color; background: none; border: none; border-radius: 5px; @@ -743,7 +744,7 @@ StScrollBar { color: $osd_fg_color; &:highlighted { - color: $selected_fg_color; + color: $_shell_fg_color; } } @@ -821,6 +822,8 @@ StScrollBar { // Top Bar // #panel { + $_panel_fg_color: $_shell_fg_color; + font-weight: bold; height: 2.1em; min-height: 27px; @@ -866,7 +869,7 @@ StScrollBar { -natural-hpadding: 10px !important; -minimum-hpadding: 6px !important; font-weight: bold; - color: $selected_fg_color !important; + color: $_panel_fg_color !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; @@ -879,7 +882,7 @@ StScrollBar { } &:hover { - color: $selected_fg_color !important; + color: $_panel_fg_color !important; background-color: transparentize(black, 0.83); border-bottom-width: 1px; border-color: transparent; @@ -1403,9 +1406,9 @@ StScrollBar { .list-search-result-content { spacing: 12px; padding: 12px; } -.list-search-result-title { font-size: 1.5em; color: $selected_fg_color; } +.list-search-result-title { font-size: 1.5em; color: $_shell_fg_color; } -.list-search-result-description { color: darken($selected_fg_color, 20%); } +.list-search-result-description { color: darken($_shell_fg_color, 20%); } .search-provider-icon { padding: 15px; } .search-provider-icon-more { @@ -1460,7 +1463,7 @@ StScrollBar { .dash-label { border-radius: 3px; padding: 4px 12px; - color: $selected_fg_color; + color: $_shell_fg_color; background-color: rgba(0, 0, 0, 0.7); text-align: center; -x-offset: 3px; @@ -1718,7 +1721,7 @@ StScrollBar { } %icon_tile { - color: $selected_fg_color; + color: $_shell_fg_color; border-radius: 2px; padding: 6px; border: 1px solid transparent; @@ -1741,6 +1744,7 @@ StScrollBar { } &:active > .overview-icon, &:checked > .overview-icon { + color: $selected_fg_color; background-color: $selected_bg_color; box-shadow: none; } @@ -2420,7 +2424,7 @@ StEntry.chat-response { padding-right: .3em; &:hover { - color: $selected_fg_color; + color: $_shell_fg_color; text-shadow: black 0px 2px 2px; } &:selected { -- cgit v1.2.3