From 48e605b7a4ab90a9e1161484e1c68eb565c10dc9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 4 Nov 2015 12:33:06 -0500
Subject: [PATCH] Adwaita: Update progressbar styling

Adjust to the changes in the previous commit. This partially
undoes the earlier progressbar changes.
---
 gtk/theme/Adwaita/_common.scss           | 24 +++++++++++++--------
 gtk/theme/Adwaita/gtk-contained-dark.css | 27 +++++++++++++-----------
 gtk/theme/Adwaita/gtk-contained.css      | 27 +++++++++++++-----------
 3 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 0386112ea2..2d9d8965bd 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2338,23 +2338,29 @@ progressbar {
   box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set
               _widget_edge();                           // here ot it gets
                                                         // clipped
-  border: 1px solid $borders_color;
-  border-radius: 3px;
-  background-color: mix($borders_color, $bg_color, 35%);
 
   &:backdrop {
     color: $backdrop_insensitive_color;
-    border-color: $backdrop_borders_color;
-    background-color: $backdrop_dark_fill;
-    box-shadow: 0 1px transparentize(white,1);
   }
   &.osd {
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 0;
     -GtkProgressBar-min-horizontal-bar-height: 3;
-    border-style: none;
-    background-color: transparent;
-    box-shadow: none;
+    trough {
+      border-style: none;
+      background-color: transparent;
+      box-shadow: none;
+    }
+  }
+  trough {
+    border: 1px solid $borders_color;
+    border-radius: 3px;
+    background-color: mix($borders_color, $bg_color, 35%);
+    &:backdrop {
+      border-color: $backdrop_borders_color;
+      background-color: $backdrop_dark_fill;
+      box-shadow: 0 1px transparentize(white,1);
+    }
   }
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 17af0d4d76..af338af4ad 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3420,22 +3420,25 @@ progressbar {
   padding: 0;
   font-size: smaller;
   color: rgba(238, 238, 236, 0.4);
-  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-  border: 1px solid #1c1f1f;
-  border-radius: 3px;
-  background-color: #2f3434; }
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   progressbar:backdrop {
-    color: #5d6767;
-    border-color: #1f2222;
-    background-color: #303535;
-    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+    color: #5d6767; }
   progressbar.osd {
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 3;
-    border-style: none;
-    background-color: transparent;
-    box-shadow: none; }
+    -GtkProgressBar-min-horizontal-bar-height: 3; }
+    progressbar.osd trough {
+      border-style: none;
+      background-color: transparent;
+      box-shadow: none; }
+  progressbar trough {
+    border: 1px solid #1c1f1f;
+    border-radius: 3px;
+    background-color: #2f3434; }
+    progressbar trough:backdrop {
+      border-color: #1f2222;
+      background-color: #303535;
+      box-shadow: 0 1px rgba(255, 255, 255, 0); }
 
 progressbar.horizontal progress {
   background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 18bd3df0e6..6f307a2e8e 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3582,22 +3582,25 @@ progressbar {
   padding: 0;
   font-size: smaller;
   color: rgba(46, 52, 54, 0.4);
-  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white;
-  border: 1px solid #a1a1a1;
-  border-radius: 3px;
-  background-color: #d2d2d2; }
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
   progressbar:backdrop {
-    color: #c7c7c7;
-    border-color: darkgray;
-    background-color: #d5d5d5;
-    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+    color: #c7c7c7; }
   progressbar.osd {
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 3;
-    border-style: none;
-    background-color: transparent;
-    box-shadow: none; }
+    -GtkProgressBar-min-horizontal-bar-height: 3; }
+    progressbar.osd trough {
+      border-style: none;
+      background-color: transparent;
+      box-shadow: none; }
+  progressbar trough {
+    border: 1px solid #a1a1a1;
+    border-radius: 3px;
+    background-color: #d2d2d2; }
+    progressbar trough:backdrop {
+      border-color: darkgray;
+      background-color: #d5d5d5;
+      box-shadow: 0 1px rgba(255, 255, 255, 0); }
 
 progressbar.horizontal progress {
   background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);