From 06b091100947a17f29b82f92bf0fa38735eaabac Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Wed, 31 Aug 2016 00:00:33 +0200
Subject: don't use selected_fg_color in weird places

---
 common/gtk-3.0/3.18/sass/_common.scss | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'common/gtk-3.0/3.18/sass/_common.scss')

diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 83aff34..e77031d 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -237,20 +237,20 @@ $vert_padding: 5px;
     box-shadow: none;
   }
 
-  @each $e_type, $e_color in (warning, $warning_color),
-                             (error, $error_color) {
+  @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color),
+                                          (error, $error_color, $error_fg_color) {
     &.#{$e_type} {
       color: $selected_fg_color;
       border-color: if($variant=='light', $e_color, $entry_border);
       background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%));
 
       &:focus {
-        color: $selected_fg_color;
+        color: $e_fg_color;
         background-image: linear-gradient(to bottom, $e_color);
         box-shadow: none;
       }
       &:selected, &:selected:focus {
-        background-color: $selected_fg_color;
+        background-color: $e_fg_color;
         color: $e_color;
       }
     }
@@ -389,10 +389,10 @@ $_dot_color: $selected_bg_color;
   .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; }
 
   // Suggested and Destructive Action buttons
-  @each $b_type, $b_color in (suggested-action, $suggested_color),
-                             (destructive-action, $destructive_color) {
+  @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color),
+                                    (destructive-action, $destructive_color, $destructive_fg_color) {
     &.#{$b_type} {
-      @include button(suggested_destructive, $b_color);
+      @include button(suggested_destructive, $b_color, $b_fg);
 
       &.flat {
         @include button(undecorated);
@@ -400,10 +400,10 @@ $_dot_color: $selected_bg_color;
         outline-color: transparentize($b_color, 0.7);
       }
       &:hover {
-        @include button(suggested_destructive, lighten($b_color, 10%));
+        @include button(suggested_destructive, lighten($b_color, 10%), $b_fg);
       }
       &:active, &:checked {
-        @include button(suggested_destructive, darken($b_color, 10%));
+        @include button(suggested_destructive, darken($b_color, 10%), $b_fg);
       }
       &.flat:insensitive {
         @include button(undecorated);
@@ -971,14 +971,14 @@ GtkComboBox {
   // Selectionmode
   &.selection-mode,
   &.titlebar.selection-mode {
-    color: $selected_fg_color;
+    color: $selection_mode_fg;
     background-color: $selection_mode_bg;
     border-color: darken($selection_mode_bg, 4%);
     box-shadow: none;
 
     &:backdrop {
       background-color: $selection_mode_bg;
-      color: transparentize($selected_fg_color, 0.4);
+      color: transparentize($selection_mode_fg, 0.4);
     }
 
     .subtitle:link { @extend *:link:selected;  }
@@ -1128,19 +1128,19 @@ GtkComboBox {
       background-color: transparent;
     }
 
-    @each $e_type, $e_color in (warning, $warning_color),
-                               (error, $error_color) {
+    @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color),
+                                            (error, $error_color, $error_fg_color) {
       &.#{$e_type} {
-        color: $selected_fg_color;
+        color: $e_fg_color;
         border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border);
         background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%));
 
         &:focus {
-          color: $selected_fg_color;
+          color: $e_fg_color;
           background-image: linear-gradient(to bottom, $e_color);
         }
         &:selected, &:selected:focus {
-          background-color: $selected_fg_color;
+          background-color: $e_fg_color;
           color: $e_color;
         }
       }
@@ -1205,10 +1205,10 @@ GtkComboBox {
   }
 
   // Headerbar Suggested and Destructive Action buttons
-  @each $b_type, $b_color in (suggested-action, $suggested_color),
-                             (destructive-action, $destructive_color) {
+  @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color),
+                                    (destructive-action, $destructive_color, $destructive_fg_color) {
     .button.#{$b_type} {
-      @include button(suggested_destructive, $b_color);
+      @include button(suggested_destructive, $b_color, $b_fg);
 
       &.flat {
         @include button(undecorated);
@@ -1216,10 +1216,10 @@ GtkComboBox {
         outline-color: transparentize($b_color, 0.7);
       }
       &:hover {
-        @include button(suggested_destructive, lighten($b_color, 10%));
+        @include button(suggested_destructive, lighten($b_color, 10%), $b_fg);
       }
       &:active, &:checked {
-        @include button(suggested_destructive, darken($b_color, 10%));
+        @include button(suggested_destructive, darken($b_color, 10%), $b_fg);
       }
       &.flat:insensitive,
       &:insensitive { @include button(header-insensitive); }
-- 
cgit v1.2.3


From bee90f08d3bed97586f58d5f6ffb439b6f951939 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 20 Sep 2016 00:02:38 +0200
Subject: use blue highlight in wingpanel popovers

---
 common/gtk-3.0/3.18/sass/_common.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'common/gtk-3.0/3.18/sass/_common.scss')

diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index e77031d..4cd4e6e 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -1916,6 +1916,7 @@ GtkSwitch {
     background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png"));
   }
 
+  WingpanelWidgetsIndicatorPopover.popover .menuitem:hover GtkSwitch.trough#{$k},
   .menu .menuitem:hover GtkSwitch.trough#{$k},
   .list-row:selected GtkSwitch.trough#{$k},
   GtkInfoBar GtkSwitch.trough#{$k} {
@@ -1955,6 +1956,7 @@ GtkSwitch {
     // the borders of checks and radios are
     // too similar in luminosity to the selected background color, hence
     // we need special casing.
+    WingpanelWidgetsIndicatorPopover.popover .menuitem:hover .#{$w}#{$s},
     .menu .menuitem.#{$w}#{$s}:hover,
     GtkTreeView.view.#{$w}#{$s}:selected,
     .list-row:selected .#{$w}#{$s},
@@ -2036,6 +2038,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       }
     }
     //selected list-row and infobar sliders
+    WingpanelWidgetsIndicatorPopover.popover .menuitem:hover &,
     .menu .menuitem:hover &,
     .list-row:selected &,
     GtkInfoBar & {
@@ -2085,6 +2088,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       &:insensitive {  }
     }
     // troughs in selected list-rows and infobars
+    WingpanelWidgetsIndicatorPopover.popover .menuitem:hover &,
     .menu .menuitem:hover &,
     .list-row:selected &,
     GtkInfoBar & {
-- 
cgit v1.2.3


From 6e3491ff801c9488218460f720e20df3f034d6e8 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 20 Sep 2016 11:13:56 +0200
Subject: tweak treeview progressbars

---
 common/gtk-3.0/3.18/sass/_common.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'common/gtk-3.0/3.18/sass/_common.scss')

diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 4cd4e6e..d60f175 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -1394,22 +1394,29 @@ GtkTreeView.view {                                      // treeview grid lines a
     }
   }
 
-  &.progressbar { // progress bar in treeviews
+  &.progressbar, &.progressbar:focus { // progress bar in treeviews
     color: $selected_fg_color;
     border-radius: 3px;
     background-image: linear-gradient(to bottom, $selected_bg_color);
 
-    &:selected {
+    &:selected, &:selected:focus {
       color: $selected_bg_color;
       box-shadow: none;
       background-image: linear-gradient(to bottom, $selected_fg_color);
     }
   }
-  &.trough, &.trough:selected { // progress bar trough in treeviews
+  &.trough { // progress bar trough in treeviews
     color: $fg_color;
     background-image: linear-gradient(to bottom, $button_border);
     border-radius: 3px;
     border-width: 0;
+
+    &:selected, &:selected:focus {
+      color: $selected_fg_color;
+      background-image: linear-gradient(to bottom, transparentize(black, 0.8));
+      border-radius: 3px;
+      border-width: 0;
+    }
   }
 }
 
-- 
cgit v1.2.3


From 97d96272f05eb9692203cea422d70af739bb154d Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 20 Sep 2016 21:09:23 +0200
Subject: fix color of disabled labels in checked buttons

---
 common/gtk-3.0/3.18/sass/_common.scss | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'common/gtk-3.0/3.18/sass/_common.scss')

diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index d60f175..e215b31 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -327,6 +327,8 @@ $_dot_color: $selected_bg_color;
     background-clip: if($variant=='light', border-box, padding-box);
     @include button(active);
     transition-duration: 50ms;
+
+    .label:insensitive { color: inherit; opacity: 0.6; }
   }
 
   //Webkitgtk workaround start
-- 
cgit v1.2.3


From a7e9f80aab54181d8df5fbd3a77978b11f2f46c6 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 20 Sep 2016 21:30:16 +0200
Subject: spinbutton tweaks

---
 common/gtk-3.0/3.18/sass/_common.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/gtk-3.0/3.18/sass/_common.scss')

diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index e215b31..86ae0b7 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -328,7 +328,7 @@ $_dot_color: $selected_bg_color;
     @include button(active);
     transition-duration: 50ms;
 
-    .label:insensitive { color: inherit; opacity: 0.6; }
+    &:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; }
   }
 
   //Webkitgtk workaround start
-- 
cgit v1.2.3