[gnome-shell/wip/snwh/theme-refactor: 1/2] theme: fix HC after refactoring

[Sam Hewitt <snwh src gnome org>]

commit 432334c6cd624d6ccf92906b182a4acdb6db9b58
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed Jan 8 11:08:14 2020 +0100

    theme: fix HC after refactoring
    
    - panel fg color was derived from bg color. Not a good idea as it's not
      just light/drk, but HC as well.
    - deriving from dark theme means contrast for things like popover items
      is better.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/904
    
    Apply suggestion to data/theme/gnome-shell-sass/_colors.scss
    
    Apply suggestion to data/theme/gnome-shell-sass/_colors.scss
    
    Apply suggestion to data/theme/gnome-shell-sass/_drawing.scss
    
    Apply suggestion to data/theme/gnome-shell-sass/_drawing.scss
    
    Apply suggestion to data/theme/gnome-shell-sass/_high-contrast-colors.scss
    
    Apply suggestion to data/theme/gnome-shell-sass/_high-contrast-colors.scss
    
    Apply suggestion to data/theme/gnome-shell-sass/_drawing.scss

 data/theme/gnome-shell-high-contrast.scss              |  2 +-
 data/theme/gnome-shell-sass/_colors.scss               |  4 ++--
 data/theme/gnome-shell-sass/_drawing.scss              | 12 ++++++------
 data/theme/gnome-shell-sass/_high-contrast-colors.scss |  4 ++--
 data/theme/gnome-shell-sass/widgets/_panel.scss        |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/theme/gnome-shell-high-contrast.scss b/data/theme/gnome-shell-high-contrast.scss
index 23a55eb865..ed52bbb86c 100644
--- a/data/theme/gnome-shell-high-contrast.scss
+++ b/data/theme/gnome-shell-high-contrast.scss
@@ -1,4 +1,4 @@
-$variant: 'light';
+$variant: 'dark';
 
 @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 0783e69031..1e0da86b79 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -9,7 +9,7 @@ $selected_fg_color: #fff;
 $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 
30%));
 $borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 8%));
-$borders_edge: if($variant == 'light', rgba(255,255,255,0.2), transparentize($fg_color, 0.93));
+$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), transparentize($fg_color, 0.93));
 $link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
 $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 
10%));
 $top_hilight: $borders_edge;
@@ -24,7 +24,7 @@ $osd_text_color: if($variant == 'light', #000, #fff);
 $osd_bg_color: if($variant == 'light', rgba(255,255,255,0.9), transparentize(darken(desaturate(#3d3846, 
100%), 12%),0.04));
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.3));
+$osd_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.7));
 $osd_outer_borders_color: if($variant == 'light', rgba(0,0,0,0.1), lighten($osd_bg_color, 7%));
 
 $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 81ed22d287..67cfaa767e 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -72,8 +72,8 @@
 // $bg is the background color
 //
   $lbg: lightness($bg)/100%;
-  @if lightness($tc)<50% { @return rgba(255,255,255,1-$lbg/($lbg*1.3)); }
-  @else { @return rgba(0,0,0,$lbg*0.8); }
+  @if lightness($tc)<50% { @return rgba(255,255,255,$lbg/($lbg*1.3)); }
+  @else { @return rgba(0,0,0,1-$lbg*0.8); }
 }
 
 @function draw_button_hilight_color($c) {
@@ -83,10 +83,10 @@
 // $c: base color;
 //
   @if lightness($c)>90% { @return white; }
-  @else if lightness($c)>80% { @return rgba(255,255,255, 0.3); }
+  @else if lightness($c)>80% { @return rgba(255,255,255, 0.7); }
   @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
-  @else if lightness($c)>40% { @return rgba(255,255,255, 0.7); }
-  @else { @return rgba(255,255,255, 0.9); }
+  @else if lightness($c)>40% { @return rgba(255,255,255, 0.3); }
+  @else { @return rgba(255,255,255, 0.1); }
 }
 
 @mixin draw_button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
@@ -193,7 +193,7 @@
     border-color: transparent;
     background-color: transparent;
     background-image: none;
-    @include draw_shadows(inset 0 1px rgba(255,255,255,1),$blank_edge);
+    @include draw_shadows(inset 0 1px rgba(255,255,255,0),$blank_edge);
     text-shadow: none;
     icon-shadow: none;
   }
diff --git a/data/theme/gnome-shell-sass/_high-contrast-colors.scss 
b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
index 2170c6684a..710179367e 100644
--- a/data/theme/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
@@ -22,10 +22,10 @@ $destructive_color: darken(#ef2929,10%);
 
 $osd_fg_color: #eeeeec;
 $osd_bg_color: #2e3436;
-$osd_borders_color: rgba(0,0,0, 0.3);
+$osd_borders_color: rgba(0,0,0, 0.7);
 $osd_outer_borders_color: rgba(255,255,255, 0.1);
 
-$shadow_color: rgba(0,0,0, 0.9);
+$shadow_color: rgba(0,0,0, 0.1);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index ba8e6675cc..298877f236 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -3,7 +3,7 @@
 
 $panel_corner_radius: $base_border_radius+1;
 $panel_bg_color: if($variant == 'light', rgba(0,0,0,0.9), #000);
-$panel_fg_color: if($variant == 'light', darken($bg_color, 15%), darken($fg_color, 10%));
+$panel_fg_color: if($variant == 'light', darken($fg_color, 15%), darken($fg_color, 10%));
 $panel_height: 1.86em;
 
 
@@ -103,4 +103,4 @@ $panel_height: 1.86em;
 #appMenu {
   spacing: $base_spacing;
   .label-shadow { color: transparent; }
-}
\ No newline at end of file
+}