[libadwaita/wip/exalm/background-colors: 60/60] u

[Alexander Mikhaylenko <alexm src gnome org>]

commit ee9ab1b9644dd8c4bca271c445c9edf8f8d0d6cd
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Sep 21 19:47:25 2021 +0500

    u

 src/stylesheet/_colors.scss             | 35 +++++++++++++++++++++++----------
 src/stylesheet/widgets/_header-bar.scss |  8 +++-----
 src/stylesheet/widgets/_menus.scss      |  5 -----
 src/stylesheet/widgets/_notebook.scss   |  6 +++---
 src/stylesheet/widgets/_popovers.scss   |  4 ++--
 src/stylesheet/widgets/_sidebars.scss   |  6 ++++--
 src/stylesheet/widgets/_tab-view.scss   |  2 +-
 src/stylesheet/widgets/_toolbars.scss   |  5 +++--
 8 files changed, 41 insertions(+), 30 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index b5ddf765..10ca9355 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -18,17 +18,26 @@ $success_color: gtkcolor(success_color);
 $warning_color: gtkcolor(warning_color);
 $error_color: gtkcolor(error_color);
 
-@define-color base_color             #{if($variant == 'light', #ffffff, #1e1e1e)};//?
-@define-color text_color             #{if($variant == 'light', #000000, #ffffff)};//?
-@define-color bg_color               #{if($variant == 'light', #fbfbfb, #2b2b2b)};
+@define-color base_color             #{if($variant == 'light', #ffffff, #1e1e1e)};
+@define-color text_color             #{if($variant == 'light', #000000, #ffffff)};
+@define-color bg_color               #{if($variant == 'light', #fbfbfb, #242424)};
 @define-color fg_color               #{if($variant == 'light', transparentize(black, .2), white)};
-@define-color headerbar_bg_color     #{if($variant == 'light', #f0f0f0, #242424)};
+@define-color headerbar_bg_color     #{if($variant == 'light', #ebebeb, #303030)};
 @define-color headerbar_fg_color     #{if($variant == 'light', transparentize(black, .2), white)};
 @define-color headerbar_border_color #{if($variant == 'light', transparentize(black, .2), white)};
-@define-color dark_fill_color        #{if($variant == 'light', #f0f0f0, #1e1e1e)};//?
-@define-color card_bg_color          #{if($variant == 'light', white, transparentize(white, .95))};
+@define-color dark_fill_bg_color     #{if($variant == 'light', #ebebeb, #303030)};
+@define-color dark_fill_fg_color     #{if($variant == 'light', transparentize(black, .2), white)};
+@define-color dark_fill_border_color #{if($variant == 'light', transparentize(black, .2), white)};
+@define-color card_bg_color          #{if($variant == 'light', #ffffff, #303030)};
 @define-color card_fg_color          #{if($variant == 'light', transparentize(black, .2), white)};
-@define-color card_border_color      #{if($variant == 'light', gtkalpha(currentColor, .18), transparent)};
+@define-color card_border_color      #{if($variant == 'light', gtkalpha(currentColor, .18), 
gtkalpha(currentColor, .18))};
+@define-color sidebar_bg_color       #{if($variant == 'light', #ebebeb, #303030)};
+@define-color sidebar_fg_color       #{if($variant == 'light', transparentize(black, .2), white)};
+@define-color sidebar_border_color   #{if($variant == 'light', transparentize(black, .2), white)};
+@define-color popover_bg_color       #{if($variant == 'light', #ffffff, #383838)};
+@define-color popover_fg_color       #{if($variant == 'light', transparentize(black, .2), white)};
+
+$border_opacity: if($contrast == 'high', .5, .15);
 
 $base_color: gtkcolor(base_color);
 $text_color: gtkcolor(text_color);
@@ -36,11 +45,18 @@ $bg_color: gtkcolor(bg_color);
 $fg_color: gtkcolor(fg_color);
 $headerbar_bg_color: gtkcolor(headerbar_bg_color);
 $headerbar_fg_color: gtkcolor(headerbar_fg_color);
-$headerbar_border_color: gtkcolor(headerbar_border_color);
-$dark_fill: gtkcolor(dark_fill_color);
+$headerbar_border_color: gtkalpha(gtkcolor(headerbar_border_color), $border_opacity);
+$dark_fill_bg_color: gtkcolor(dark_fill_bg_color);
+$dark_fill_fg_color: gtkcolor(dark_fill_fg_color);
+$dark_fill_border_color: gtkalpha(gtkcolor(dark_fill_border_color), $border_opacity);
 $card_bg_color: gtkcolor(card_bg_color);
 $card_fg_color: gtkcolor(card_fg_color);
 $card_border_color: gtkcolor(card_border_color);
+$sidebar_bg_color: gtkcolor(sidebar_bg_color);
+$sidebar_fg_color: gtkcolor(sidebar_fg_color);
+$sidebar_border_color: gtkalpha(gtkcolor(sidebar_border_color), $border_opacity);
+$popover_bg_color: gtkcolor(popover_bg_color);
+$popover_fg_color: gtkcolor(popover_fg_color);
 
 $borders_color: gtkalpha(currentColor, .15);
 $thin_borders_color: gtkalpha(currentColor, .05);
@@ -82,7 +98,6 @@ $dim_label_opacity: 0.55;
 
 // High Contrast color overrides
 @if $contrast == 'high' {
-
   @define-color bg_color #{if($variant == 'light', lighten($light_bg, 3%), darken($dark_bg, 2%))};
   @define-color fg_color #{if($variant == 'light', darken($light_fg, 3%), lighten($dark_fg, 2%))};
 
diff --git a/src/stylesheet/widgets/_header-bar.scss b/src/stylesheet/widgets/_header-bar.scss
index 9bf85d10..e6a8905f 100644
--- a/src/stylesheet/widgets/_header-bar.scss
+++ b/src/stylesheet/widgets/_header-bar.scss
@@ -1,12 +1,10 @@
-$headerbar_border_opacity: if($contrast == 'high', .5, .15);
-
 headerbar {
   min-height: 47px;
   background-color: $headerbar_bg_color;
   color: $headerbar_fg_color;
-  box-shadow: inset 0 -1px gtkalpha($headerbar_border_color, $headerbar_border_opacity),
-              inset  1px 0 gtkalpha($headerbar_border_color, $headerbar_border_opacity),
-              inset -1px 0 gtkalpha($headerbar_border_color, $headerbar_border_opacity);
+  box-shadow: inset 0 -1px $headerbar_border_color,
+              inset  1px 0 $headerbar_border_color,
+              inset -1px 0 $headerbar_border_color;
 
   margin-left: -1px;
   margin-right: -1px;
diff --git a/src/stylesheet/widgets/_menus.scss b/src/stylesheet/widgets/_menus.scss
index 6bc4174d..aedb5606 100644
--- a/src/stylesheet/widgets/_menus.scss
+++ b/src/stylesheet/widgets/_menus.scss
@@ -40,14 +40,9 @@ popover.menu {
     }
   }
 
-  & > arrow,
   &.background > contents {
-    background-color: $menu_color;
-    color: $text_color;
     padding: 0;
-  }
 
-  &.background > contents {
     &, > scrolledwindow > viewport {
       > stack > box {
         padding: $menu-margin;
diff --git a/src/stylesheet/widgets/_notebook.scss b/src/stylesheet/widgets/_notebook.scss
index ef25d0ae..66c73d0c 100644
--- a/src/stylesheet/widgets/_notebook.scss
+++ b/src/stylesheet/widgets/_notebook.scss
@@ -3,9 +3,10 @@ notebook {
 
   > header {
     padding: 1px;
-    border-color: $borders_color;
+    border-color: $dark_fill_border_color;
     border-width: 1px;
-    background-color: $dark_fill;
+    background-color: $dark_fill_bg_color;
+    color: $dark_fill_fg_color;
     background-clip: padding-box;
 
     > tabs { margin: -1px; }
@@ -123,7 +124,6 @@ notebook {
       min-width: 30px;
       padding: 3px 12px;
 
-      color: $fg_color;
       font-weight: normal;
 
       &:hover {
diff --git a/src/stylesheet/widgets/_popovers.scss b/src/stylesheet/widgets/_popovers.scss
index 58ee6907..c62f1f2d 100644
--- a/src/stylesheet/widgets/_popovers.scss
+++ b/src/stylesheet/widgets/_popovers.scss
@@ -6,8 +6,8 @@ popover.background {
   > contents {
     $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize(black, 0.25));
 
-    background-color: $menu_color;
-    color: $text_color;
+    background-color: $popover_bg_color;
+    color: $popover_fg_color;
     background-clip: padding-box;
     border: 1px solid $_popover_border;
     box-shadow: 0 1px 2px transparentize(black, 0.7);
diff --git a/src/stylesheet/widgets/_sidebars.scss b/src/stylesheet/widgets/_sidebars.scss
index b30ff971..fac4414c 100644
--- a/src/stylesheet/widgets/_sidebars.scss
+++ b/src/stylesheet/widgets/_sidebars.scss
@@ -1,17 +1,19 @@
 .sidebar {
   background-clip: padding-box;
+  background-color: $sidebar_bg_color;
+  color: $sidebar_fg_color;
 
   &:not(separator) {
     &:dir(ltr),
     &.left,
     &.left:dir(rtl) {
-      border-right: 1px solid $borders_color;
+      border-right: 1px solid $sidebar_border_color;
       border-left-style: none;
     }
 
     &:dir(rtl),
     &.right {
-      border-left: 1px solid $borders_color;
+      border-left: 1px solid $sidebar_border_color;
       border-right-style: none;
     }
   }
diff --git a/src/stylesheet/widgets/_tab-view.scss b/src/stylesheet/widgets/_tab-view.scss
index e7fb32a4..b467e37f 100644
--- a/src/stylesheet/widgets/_tab-view.scss
+++ b/src/stylesheet/widgets/_tab-view.scss
@@ -1,5 +1,5 @@
 $tab_bg: $headerbar_bg_color;
-$tab_border: gtkalpha($headerbar_border_color, $headerbar_border_opacity);
+$tab_border: $headerbar_border_color;
 
 @mixin undershoot-gradient($dir) {
   @if $variant == 'dark' {
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index a3f1f20c..3563d3fd 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -132,8 +132,9 @@ searchbar > revealer > box {
   padding: 6px 6px 7px 6px;
   border-spacing: 6px;
 
-  background-color: $dark_fill;
-  box-shadow: inset 0 -1px $borders_color;
+  background-color: $dark_fill_bg_color;
+  color: $dark_fill_fg_color;
+  box-shadow: inset 0 -1px $dark_fill_border_color;
 
  .close {
     min-width: 18px;