Adwaita: refactor levelbar styling.

3 files changed, 61 insertions, 79 deletions

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a949e85d9b..b4a59946a8 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3269,48 +3269,38 @@ levelbar {
 
   &.vertical.discrete block { margin: 1px 0; }
 
-  block:not(.empty) {
-    border: 1px solid if($variant=='light', darken($selected_bg_color,10%),
-                                              darken($selected_bg_color,5%));
-    background-color: $selected_bg_color;
-    box-shadow: 0 1px transparentize(black, 0.9);
+  block {
+    border: 1px solid;
     border-radius: 1px;
+    box-shadow: 0 1px transparentize(black, 0.8);
 
-    &:backdrop {
-      border-color: $selected_bg_color;
-      box-shadow: none;
-    }
-  }
+    &:backdrop { box-shadow: none; }
 
-  block {
     &.low {
-      border-color: darken($warning_color,10%);
+      border-color: if($variant == 'light', darken($warning_color, 20%), $warning_color);
       background-color: $warning_color;
 
       &:backdrop { border-color: $warning_color; };
     }
 
-    &.high {
-      border-color: darken($selected_bg_color,10%);
+    &.high,
+    &:not(.empty) {
+      border-color: if($variant == 'light', darken($selected_bg_color, 20%), $selected_bg_color);
       background-color: $selected_bg_color;
 
       &:backdrop { border-color: $selected_bg_color; }
     }
 
     &.full {
-      border-color: darken($success_color,10%);
+      border-color: if($variant == 'light', darken($success_color, 20%), $success_color);
       background-color: $success_color;
 
       &:backdrop { border-color: $success_color; };
     }
 
     &.empty {
-      border: 1px solid if($variant=='light', darken($selected_bg_color,10%),
-                                              darken($selected_bg_color,5%));
-      border-radius: 1px;
       background-color: transparent;
-      border-color: if($variant=='light', transparentize($fg_color,0.8),
-                                          transparentize($fg_color,0.9));
+      border-color: if($variant == 'light', transparentize($fg_color,0.8), transparentize($fg_color,0.9));
       box-shadow: none;
 
       &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index a83723d292..0c4215e3db 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3624,37 +3624,33 @@ levelbar.horizontal.discrete block {
   margin: 0 1px; }
 levelbar.vertical.discrete block {
   margin: 1px 0; }
-levelbar block:not(.empty) {
-  border: 1px solid #1c5187;
-  background-color: #215d9c;
-  box-shadow: 0 1px rgba(0, 0, 0, 0.1);
-  border-radius: 1px; }
-  levelbar block:not(.empty):backdrop {
+levelbar block {
+  border: 1px solid;
+  border-radius: 1px;
+  box-shadow: 0 1px rgba(0, 0, 0, 0.2); }
+  levelbar block:backdrop {
+    box-shadow: none; }
+  levelbar block.low {
+    border-color: #f57900;
+    background-color: #f57900; }
+    levelbar block.low:backdrop {
+      border-color: #f57900; }
+  levelbar block.high, levelbar block:not(.empty) {
     border-color: #215d9c;
+    background-color: #215d9c; }
+    levelbar block.high:backdrop, levelbar block:not(.empty):backdrop {
+      border-color: #215d9c; }
+  levelbar block.full {
+    border-color: #5aa411;
+    background-color: #5aa411; }
+    levelbar block.full:backdrop {
+      border-color: #5aa411; }
+  levelbar block.empty {
+    background-color: transparent;
+    border-color: rgba(238, 238, 236, 0.1);
     box-shadow: none; }
-levelbar block.low {
-  border-color: #c26000;
-  background-color: #f57900; }
-  levelbar block.low:backdrop {
-    border-color: #f57900; }
-levelbar block.high {
-  border-color: #184472;
-  background-color: #215d9c; }
-  levelbar block.high:backdrop {
-    border-color: #215d9c; }
-levelbar block.full {
-  border-color: #40760c;
-  background-color: #5aa411; }
-  levelbar block.full:backdrop {
-    border-color: #5aa411; }
-levelbar block.empty {
-  border: 1px solid #1c5187;
-  border-radius: 1px;
-  background-color: transparent;
-  border-color: rgba(238, 238, 236, 0.1);
-  box-shadow: none; }
-  levelbar block.empty:backdrop {
-    border-color: rgba(148, 151, 150, 0.15); }
+    levelbar block.empty:backdrop {
+      border-color: rgba(148, 151, 150, 0.15); }
 
 /****************
  * Print dialog *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b7ef528eec..52f72d639c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3653,37 +3653,33 @@ levelbar.horizontal.discrete block {
   margin: 0 1px; }
 levelbar.vertical.discrete block {
   margin: 1px 0; }
-levelbar block:not(.empty) {
-  border: 1px solid #2a76c6;
-  background-color: #4a90d9;
-  box-shadow: 0 1px rgba(0, 0, 0, 0.1);
-  border-radius: 1px; }
-  levelbar block:not(.empty):backdrop {
-    border-color: #4a90d9;
-    box-shadow: none; }
-levelbar block.low {
-  border-color: #c26000;
-  background-color: #f57900; }
-  levelbar block.low:backdrop {
-    border-color: #f57900; }
-levelbar block.high {
-  border-color: #2a76c6;
-  background-color: #4a90d9; }
-  levelbar block.high:backdrop {
-    border-color: #4a90d9; }
-levelbar block.full {
-  border-color: #5aa411;
-  background-color: #73d216; }
-  levelbar block.full:backdrop {
-    border-color: #73d216; }
-levelbar block.empty {
-  border: 1px solid #2a76c6;
+levelbar block {
+  border: 1px solid;
   border-radius: 1px;
-  background-color: transparent;
-  border-color: rgba(46, 52, 54, 0.2);
-  box-shadow: none; }
-  levelbar block.empty:backdrop {
-    border-color: rgba(139, 142, 143, 0.15); }
+  box-shadow: 0 1px rgba(0, 0, 0, 0.2); }
+  levelbar block:backdrop {
+    box-shadow: none; }
+  levelbar block.low {
+    border-color: #8f4700;
+    background-color: #f57900; }
+    levelbar block.low:backdrop {
+      border-color: #f57900; }
+  levelbar block.high, levelbar block:not(.empty) {
+    border-color: #215d9c;
+    background-color: #4a90d9; }
+    levelbar block.high:backdrop, levelbar block:not(.empty):backdrop {
+      border-color: #4a90d9; }
+  levelbar block.full {
+    border-color: #40760c;
+    background-color: #73d216; }
+    levelbar block.full:backdrop {
+      border-color: #73d216; }
+  levelbar block.empty {
+    background-color: transparent;
+    border-color: rgba(46, 52, 54, 0.2);
+    box-shadow: none; }
+    levelbar block.empty:backdrop {
+      border-color: rgba(139, 142, 143, 0.15); }
 
 /****************
  * Print dialog *