Merge branch 'master' into dark_variant

3 files changed, 17 insertions, 3 deletions

diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index 40181b2..7ca39c0 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -242,7 +242,7 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   }
 
   &.progressbar {
-    margin: 2px;
+    margin: 2px 12px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: $selected_bg_color;
@@ -1195,6 +1195,12 @@ GtkComboBox {
       background-color: $selected_fg_color;
       color: $selected_bg_color;
     }
+
+    &.progressbar {
+      border-color: $selected_bg_color;
+      background-image: none;
+      background-color: transparent;
+    }
   }
 
   // Header-bar Buttons
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index e46b99d..068fb53 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -169,7 +169,7 @@ GtkTextView {
     background-color: #5294E2;
     color: #ffffff; }
   .entry.progressbar {
-    margin: 2px;
+    margin: 2px 12px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -904,6 +904,10 @@ GtkComboBox {
   .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus {
     background-color: #ffffff;
     color: #5294E2; }
+  .primary-toolbar .entry.progressbar, .header-bar .entry.progressbar {
+    border-color: #5294E2;
+    background-image: none;
+    background-color: transparent; }
 .primary-toolbar .button, .header-bar .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 3a503e9..4289ee0 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -169,7 +169,7 @@ GtkTextView {
     background-color: #5294E2;
     color: #ffffff; }
   .entry.progressbar {
-    margin: 2px;
+    margin: 2px 12px;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #5294E2;
@@ -904,6 +904,10 @@ GtkComboBox {
   .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus {
     background-color: #ffffff;
     color: #5294E2; }
+  .primary-toolbar .entry.progressbar, .header-bar .entry.progressbar {
+    border-color: #5294E2;
+    background-image: none;
+    background-color: transparent; }
 .primary-toolbar .button, .header-bar .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);