[gtk+] Adwaita: Update levelbar styling

[Matthias Clasen <matthiasc src gnome org>]

commit d5ab5fee3b5403809051ba48ff7ea3892f6c3570
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 13 00:56:54 2015 -0500

    Adwaita: Update levelbar styling
    
    Adapt to the changes in the previous commit. In particular, fix
    the handling of low and high offsets. Anything below the low offset
    gets warning color, anything below high gets selected background,
    and anything below the new full offset gets success color.

 gtk/theme/Adwaita/_common.scss           |   23 ++++++++++++++---------
 gtk/theme/Adwaita/gtk-contained-dark.css |   27 ++++++++++++++++-----------
 gtk/theme/Adwaita/gtk-contained.css      |   27 ++++++++++++++++-----------
 3 files changed, 46 insertions(+), 31 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 631bf61..9ed98b1 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2439,9 +2439,9 @@ levelbar {
       @include entry(backdrop);
     }
   }
-  &.horizontal block.discrete { margin: 0 1px; }
-  &.vertical block.discrete { margin: 1px 0; }
-  & block.filled {
+  &.horizontal.discrete block { margin: 0 1px; }
+  &.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;
@@ -2452,16 +2452,21 @@ levelbar {
       box-shadow: none;
     }
   }
-  & block.level-high {
-    border-color: darken($success_color,10%);
-    background-color: $success_color;
-    &:backdrop { border-color: $success_color; }
-  }
-  & block.level-low {
+  & block.low {
     border-color: darken($warning_color,10%);
     background-color: $warning_color;
     &:backdrop { border-color: $warning_color; };
   }
+  & block.high {
+    border-color: darken($selected_bg_color,10%);
+    background-color: $selected_bg_color;
+    &:backdrop { border-color: $selected_bg_color; }
+  }
+  & block.full {
+    border-color: darken($success_color,10%);
+    background-color: $success_color;
+    &:backdrop { border-color: $success_color; };
+  }
   & block.empty {
     border: 1px solid if($variant=='light', darken($selected_bg_color,10%),
                                               darken($selected_bg_color,5%));
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7174e9f..376607f 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3390,28 +3390,33 @@ levelbar {
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
-  levelbar.horizontal block.discrete {
+  levelbar.horizontal.discrete block {
     margin: 0 1px; }
-  levelbar.vertical block.discrete {
+  levelbar.vertical.discrete block {
     margin: 1px 0; }
-  levelbar block.filled {
+  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.filled:backdrop {
+    levelbar block:not(.empty):backdrop {
       border-color: #215d9c;
       box-shadow: none; }
-  levelbar block.level-high {
-    border-color: #40760c;
-    background-color: #5aa411; }
-    levelbar block.level-high:backdrop {
-      border-color: #5aa411; }
-  levelbar block.level-low {
+  levelbar block.low {
     border-color: #c26000;
     background-color: #f57900; }
-    levelbar block.level-low:backdrop {
+    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;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 709f0fc..489d65b 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3552,28 +3552,33 @@ levelbar {
       border-color: darkgray;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
-  levelbar.horizontal block.discrete {
+  levelbar.horizontal.discrete block {
     margin: 0 1px; }
-  levelbar.vertical block.discrete {
+  levelbar.vertical.discrete block {
     margin: 1px 0; }
-  levelbar block.filled {
+  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.filled:backdrop {
+    levelbar block:not(.empty):backdrop {
       border-color: #4a90d9;
       box-shadow: none; }
-  levelbar block.level-high {
-    border-color: #5aa411;
-    background-color: #73d216; }
-    levelbar block.level-high:backdrop {
-      border-color: #73d216; }
-  levelbar block.level-low {
+  levelbar block.low {
     border-color: #c26000;
     background-color: #f57900; }
-    levelbar block.level-low:backdrop {
+    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;
     border-radius: 1px;