From 373a3517b31d445aa44628a5f7278c9bb4a76541 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 11 Nov 2015 00:30:24 -0500
Subject: [PATCH] HighContrast: Update levelbar styling

Adapt to the changes in the previous release.
---
 gtk/theme/HighContrast/_common.scss | 49 ++++++++++++++-------------
 gtk/theme/HighContrast/gtk.css      | 51 +++++++++++++++--------------
 2 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index c53b9a561e..f8c42c3f82 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1791,8 +1791,8 @@ GtkLevelBar.vertical {
   -GtkLevelBar-min-block-height: 34;
 }
 
-.level-bar {
-  &.trough {
+levelbar {
+  & trough {
     // FIXME: outset not working
     padding: 2px;
     border-radius: 3px;
@@ -1801,9 +1801,9 @@ GtkLevelBar.vertical {
       @include entry(backdrop);
     }
   }
-  &.fill-block {
-    // FIXME: it would be nice to set make fill blocks bigger, but we'd need
-    // :nth-child working on discrete indicators
+  &.horizontal block.discrete { margin: 0 1px; }
+  &.vertical block.discrete { margin: 1px 0; }
+  & block.filled {
     border-width: 1px;
     border-style: solid;
     border-color: darken($selected_bg_color,10%);
@@ -1814,26 +1814,25 @@ GtkLevelBar.vertical {
       border-color: $selected_bg_color;
       box-shadow: none;
     }
-    &.indicator-discrete {
-      &.horizontal { margin: 0 1px; }
-      &.vertical { margin: 1px 0; }
-    }
-    &.level-high {
-      border-color: darken($success_color,10%);
-      background-color: $success_color;
-      &:backdrop { border-color: $success_color; }
-    }
-    &.level-low {
-      border-color: darken($warning_color,10%);
-      background-color: $warning_color;
-      &:backdrop { border-color: $warning_color; };
-    }
-    &.empty-fill-block {
-      background-color: transparent;
-      border-color: transparentize($fg_color,0.8);
-      box-shadow: none;
-      &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); }
-    }
+  }
+  & block.level-high {
+    border-color: darken($success_color,10%);
+    background-color: $success_color;
+    &:backdrop { border-color: $success_color; }
+  }
+  & block.level-low {
+    border-color: darken($warning_color,10%);
+    background-color: $warning_color;
+    &:backdrop { border-color: $warning_color; };
+  }
+  & block.empty {
+    border-width: 1px;
+    border-style: solid;
+    background-color: transparent;
+    border-color: transparentize($fg_color,0.8);
+    border-radius: 1px;
+    box-shadow: none;
+    &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); }
   }
 }
 
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 954b89ab1a..708afce1c1 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -1949,7 +1949,7 @@ GtkLevelBar.vertical {
   -GtkLevelBar-min-block-width: 3;
   -GtkLevelBar-min-block-height: 34; }
 
-.level-bar.trough {
+levelbar trough {
   padding: 2px;
   border-radius: 3px;
   background-color: transparent;
@@ -1957,43 +1957,46 @@ GtkLevelBar.vertical {
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
   border-color: gray;
   box-shadow: inset 0 2px 2px -2px gray; }
-  .level-bar.trough:backdrop {
+  levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
     color: #000;
     background-image: linear-gradient(to bottom, #fff);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
-.level-bar.fill-block {
+levelbar.horizontal block.discrete {
+  margin: 0 1px; }
+levelbar.vertical block.discrete {
+  margin: 1px 0; }
+levelbar block.filled {
   border-width: 1px;
   border-style: solid;
   border-color: black;
   background-color: #000;
   box-shadow: 0 1px rgba(0, 0, 0, 0.1);
   border-radius: 1px; }
-  .level-bar.fill-block:backdrop {
+  levelbar block.filled:backdrop {
     border-color: #000;
     box-shadow: none; }
-  .level-bar.fill-block.indicator-discrete.horizontal {
-    margin: 0 1px; }
-  .level-bar.fill-block.indicator-discrete.vertical {
-    margin: 1px 0; }
-  .level-bar.fill-block.level-high {
-    border-color: #5aa411;
-    background-color: #73d216; }
-    .level-bar.fill-block.level-high:backdrop {
-      border-color: #73d216; }
-  .level-bar.fill-block.level-low {
-    border-color: #c26000;
-    background-color: #f57900; }
-    .level-bar.fill-block.level-low:backdrop {
-      border-color: #f57900; }
-  .level-bar.fill-block.empty-fill-block {
-    background-color: transparent;
-    border-color: rgba(0, 0, 0, 0.2);
-    box-shadow: none; }
-    .level-bar.fill-block.empty-fill-block:backdrop {
-      border-color: rgba(0, 0, 0, 0.15); }
+levelbar block.level-high {
+  border-color: #5aa411;
+  background-color: #73d216; }
+  levelbar block.level-high:backdrop {
+    border-color: #73d216; }
+levelbar block.level-low {
+  border-color: #c26000;
+  background-color: #f57900; }
+  levelbar block.level-low:backdrop {
+    border-color: #f57900; }
+levelbar block.empty {
+  border-width: 1px;
+  border-style: solid;
+  background-color: transparent;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-radius: 1px;
+  box-shadow: none; }
+  levelbar block.empty:backdrop {
+    border-color: rgba(0, 0, 0, 0.15); }
 
 textview text selection, textview text selection:focus, textview text selection:hover,
 .view selection,