From 4fe64e43bc92262031fe60d8fba4ec4764a7d436 Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Wed, 29 May 2019 17:14:37 +0200 Subject: [PATCH] Use $variant for bubble colors, fix high-contrast --- data/theme/gnome-shell-sass/_colors.scss | 14 +++++++------- data/theme/gnome-shell-sass/_common.scss | 16 +++++++++------- .../gnome-shell-sass/_high-contrast-colors.scss | 8 ++++++++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss index b14d1f179..0e7f22337 100644 --- a/data/theme/gnome-shell-sass/_colors.scss +++ b/data/theme/gnome-shell-sass/_colors.scss @@ -20,18 +20,18 @@ $error_color: #ff8080; $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%)); $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%)); -$osd_fg_color: #eeeeec; +$osd_fg_color: $fg_color; $osd_bg_color: transparentize($bg_color, 0.02); $osd_borders_color: transparentize(black, 0.3); -$osd_outer_borders_color: #3d3d3d; +$osd_outer_borders_color: if($variant=='light', transparentize(black, 0.6), #3d3d3d); $tooltip_borders_color: $osd_outer_borders_color; -$bubble_bg_color: darken(white, 4%); -$bubble_fg_color: darken(#2e3436, 6%); -$bubble_borders_color: transparentize($bubble_fg_color, 0.75); -$bubble_outer_borders_color: transparentize(black, 0.6); -$bubble_hover_bg_color: transparentize($bubble_fg_color, 0.95); +$bubble_bg_color: if($variant == 'light', darken(white, 4%), $bg_color); +$bubble_fg_color: if($variant == 'light', darken(#2e3436, 6%), $fg_color); +$bubble_borders_color: if($variant == 'light', transparentize($bubble_fg_color, 0.75), $borders_color); +$bubble_outer_borders_color: $osd_outer_borders_color; +$bubble_hover_bg_color: transparentize($bubble_fg_color, 0.94); $bubble_active_bg_color: $selected_bg_color;//transparentize($bubble_fg_color, 0.84); $bubble_active_fg_color: $selected_fg_color; diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss index 7ba54cd7a..0c66ff86f 100644 --- a/data/theme/gnome-shell-sass/_common.scss +++ b/data/theme/gnome-shell-sass/_common.scss @@ -6,6 +6,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; $panel-corner-radius: 6px; $medium_radius: 9px; +$_trough_color: transparentize($bubble_fg_color, 0.7); /* Copyright 2009, 2015 Red Hat, Inc. * @@ -130,7 +131,7 @@ StScrollBar { .slider { height: 1em; -barlevel-height: 0.3em; - -barlevel-background-color: lighten($bubble_fg_color, 25%); //background of the trough + -barlevel-background-color: $_trough_color; //background of the trough -barlevel-border-color: transparent; //trough border color -barlevel-active-background-color: $selected_bg_color; //active trough fill -barlevel-active-border-color: transparent; //active trough border @@ -157,6 +158,7 @@ StScrollBar { /* Switches */ .toggle-switch { + color: $fg_color; width: 46px; height: 22px; background-size: contain; @@ -613,7 +615,7 @@ StScrollBar { .level { height: 0.6em; -barlevel-height: 0.6em; - -barlevel-background-color: transparentize(darken($osd_bg_color,15%),0.5); + -barlevel-background-color: $_trough_color; -barlevel-active-background-color: $osd_fg_color; -barlevel-overdrive-color: $destructive_color; -barlevel-overdrive-separator-width: 0.2em; @@ -752,7 +754,7 @@ StScrollBar { box-shadow: none; border-color: $bubble_borders_color; } - background-color: white; + background-color: $bubble_bg_color; color: $bubble_fg_color; &:hover { background-color: $bubble_hover_bg_color; } &:active { @@ -830,7 +832,7 @@ StScrollBar { } &:hover { - color: lighten($fg_color, 10%); + color: $selected_fg_color; } &:active, &:overview, &:focus, &:checked { @@ -838,7 +840,7 @@ StScrollBar { // a box-shadow background-color: rgba(0, 0, 0, 0.01); box-shadow: inset 0 -2px 0px lighten($selected_bg_color,5%); - color: lighten($fg_color,10%); + color: $selected_fg_color; } .system-status-icon { icon-size: 1.09em; padding: 0 5px; } @@ -886,7 +888,7 @@ StScrollBar { .datemenu-displays-box { spacing: 1em; } .datemenu-calendar-column { - border: 0 solid darken($bubble_bg_color, 15%); + border: 0 solid transparentize($bubble_fg_color, 0.9); &:ltr { border-left-width: 1px; } &:rtl { border-right-width: 1px; } } @@ -1053,7 +1055,7 @@ StScrollBar { } .message-list-clear-button.button { - background-color: white; + background-color: $bubble_bg_color; color: $bubble_fg_color; box-shadow: none; border-color: $bubble_borders_color; diff --git a/data/theme/gnome-shell-sass/_high-contrast-colors.scss b/data/theme/gnome-shell-sass/_high-contrast-colors.scss index af1e52f0c..e7c8ceb9b 100644 --- a/data/theme/gnome-shell-sass/_high-contrast-colors.scss +++ b/data/theme/gnome-shell-sass/_high-contrast-colors.scss @@ -27,6 +27,14 @@ $osd_outer_borders_color: transparentize(white, 0.9); $tooltip_borders_color: $osd_outer_borders_color; +$bubble_bg_color: if($variant == 'light', darken(white, 4%), $bg_color); +$bubble_fg_color: if($variant == 'light', darken(#2e3436, 6%), $fg_color); +$bubble_borders_color: if($variant == 'light', transparentize($bubble_fg_color, 0.75), $borders_color); +$bubble_outer_borders_color: $osd_outer_borders_color; +$bubble_hover_bg_color: transparentize($bubble_fg_color, 0.94); +$bubble_active_bg_color: $selected_bg_color;//transparentize($bubble_fg_color, 0.84); +$bubble_active_fg_color: $selected_fg_color; + //insensitive state derived colors $insensitive_fg_color: mix($fg_color, $bg_color, 50%); $insensitive_bg_color: mix($bg_color, $base_color, 60%);