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.20/sass/_applications.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index b1a81b4..3bd8448 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -35,7 +35,7 @@ terminal-window {
 }
 
 .nautilus-desktop.nautilus-canvas-item {
-  color: $selected_fg_color;
+  color: white;
   text-shadow: 1px 1px transparentize(black, 0.4);
 
   &:active { color: $fg_color; }
@@ -479,7 +479,7 @@ button.documents-favorite:active:hover {
   }
 
   &:checked {
-    color: $selected_fg_color;
+    color: white;
     background-color: transparentize(black, 0.75);
     box-shadow: inset 0 -2px $selected_bg_color;
   }
-- 
cgit v1.2.3


From 0cfa794f7c067ea222a7e6b4a8629f6b3532d3a6 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Wed, 31 Aug 2016 01:00:14 +0200
Subject: GTK 3.22: fix parsing errors

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

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 3bd8448..de316cd 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -572,7 +572,7 @@ button.documents-favorite:active:hover {
     border: 1px solid rgba(0, 0, 0, 0.35);
     border-radius: 3px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-    background-image: linear-gradient(to bottom, white);
+    background-image: _solid(white);
     background-color: transparent;
 
   .title, .label {
-- 
cgit v1.2.3


From 1c706464c5de388d83440cb684c6a8d4d8255153 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Wed, 31 Aug 2016 13:06:14 +0200
Subject: nautilus: add conflict-row styling

---
 common/gtk-3.0/3.20/sass/_applications.scss | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index de316cd..c6cb1dd 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -104,6 +104,21 @@ $disk_space_free: darken($bg_color, 3%);
   animation-iteration-count: 3;
 }
 
+// Batch renaming dialog
+.conflict-row.activatable {
+  &, &:active {
+    color: $error_fg_color;
+    background-color: $error_color;
+  }
+
+  &:hover { background-color: lighten($error_color, 10%); }
+
+  &:selected {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+  }
+}
+
 //
 // Nemo
 //
-- 
cgit v1.2.3


From e250405fdb7509b3d3f8fb9c7ca6a78f0f59bad6 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 13 Sep 2016 17:16:32 +0200
Subject: fix gnome-flashback panel background

---
 common/gtk-3.0/3.20/sass/_applications.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index c6cb1dd..6b9d8df 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -434,7 +434,8 @@ button.documents-favorite:active:hover {
 // Mate/Gnome Flashback Panel
 //
 .gnome-panel-menu-bar,
-.mate-panel-menu-bar {
+.mate-panel-menu-bar,
+panel-toplevel.background {
 
   &, menubar { background-color: $panel_bg; }
 
-- 
cgit v1.2.3


From 32a5aa99d306143caa03fdbab30a635be46c69fe Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 19 Sep 2016 21:01:58 +0200
Subject: gnome-panel: remove double background from menubar

---
 common/gtk-3.0/3.20/sass/_applications.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 6b9d8df..e0cfa58 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -433,11 +433,12 @@ button.documents-favorite:active:hover {
 //
 // Mate/Gnome Flashback Panel
 //
-.gnome-panel-menu-bar,
 .mate-panel-menu-bar,
 panel-toplevel.background {
 
-  &, menubar { background-color: $panel_bg; }
+  background-color: $panel_bg;
+
+  menubar { background: none; }
 
   menubar,
   #PanelApplet label,
-- 
cgit v1.2.3


From 64382c9bf6504297b74bf56ea1d0962ac8a3e60b Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 19 Sep 2016 21:32:44 +0200
Subject: mate-panel, gnome-panel: remove transparency

---
 common/gtk-3.0/3.20/sass/_applications.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index e0cfa58..ea98120 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -436,9 +436,7 @@ button.documents-favorite:active:hover {
 .mate-panel-menu-bar,
 panel-toplevel.background {
 
-  background-color: $panel_bg;
-
-  menubar { background: none; }
+  &, menubar { background-color: opacify($panel_bg, 1); }
 
   menubar,
   #PanelApplet label,
@@ -516,6 +514,8 @@ panel-toplevel.background {
     color: $selected_fg_color;
     border: none;
     background-color: $selected_bg_color;
+
+    label, image { color: inherit; }
   }
 }
 
-- 
cgit v1.2.3


From 8266ad0ebc8f9c0dbce7e18f0c100873f753b2ad Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 19 Sep 2016 22:00:11 +0200
Subject: add some mate application styling

---
 common/gtk-3.0/3.20/sass/_applications.scss | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index ea98120..c5882b0 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -7,9 +7,10 @@ terminal-window notebook {
 }
 
 //
-// GNOME Terminal
+// GNOME Terminal, MATE Terminal
 //
-terminal-window {
+terminal-window,
+.mate-terminal {
 
   notebook {
     > header.top {
@@ -264,6 +265,23 @@ $disk_space_free: darken($bg_color, 3%);
   }
 }
 
+//
+// Pluma
+//
+
+.pluma-window statusbar frame > border { border: none; }
+
+.pluma-window notebook > stack scrolledwindow { border-width: 0 0 1px 0; }
+
+#pluma-status-combo-button {
+  min-height: 0;
+  padding: 0;
+
+  border-top: none;
+  border-bottom: none;
+  border-radius: 0;
+}
+
 //
 // Gnome Builder
 //
-- 
cgit v1.2.3


From fb1a401ba9c8b32a2c1159ea26816ad21750174a Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 20 Sep 2016 22:44:33 +0200
Subject: add more Gnome Flashback styling

---
 common/gtk-3.0/3.20/sass/_applications.scss | 50 +++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index c5882b0..2f4e4cb 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -448,6 +448,56 @@ button.documents-favorite:active:hover {
   border-color: transparent; // Remove black border on over- and undershoot
 }
 
+//
+// Gnome Flashback
+//
+#gf-bubble,
+#gf-osd-window,
+#gf-input-source-popup,
+#gf-candidate-popup {
+  &, &.solid {
+    color: lighten($osd_fg_color, 7%);
+    background-color: $osd_bg_color;
+    border: 1px solid darken($osd_bg_color, 8%);
+    border-radius: 2px;
+  }
+
+  levelbar {
+    block {
+      &.low, &.high, &.full {
+        background-color: $selected_bg_color;
+        border-color: $selected_bg_color;
+      }
+      &.empty { background-color: darken($osd_bg_color, 5%); }
+    }
+    trough { background: none; }
+  }
+
+  // FIXME still needs button styling
+}
+
+#gf-input-source {
+  min-height: 32px;
+  min-width: 40px;
+
+  &:selected {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    border-radius: 2px;
+  }
+}
+
+gf-candidate-box {
+  label { padding: 3px; }
+
+  &:hover,
+  &:selected {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    border-radius: 2px;
+  }
+}
+
 //
 // Mate/Gnome Flashback Panel
 //
-- 
cgit v1.2.3


From e2fde8358258bd1ab06a20c7bb2e750e9449a5fe Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Wed, 28 Sep 2016 20:58:28 +0200
Subject: add Mate OSD window styling

---
 common/gtk-3.0/3.20/sass/_applications.scss | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 2f4e4cb..5d221c4 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -498,6 +498,26 @@ gf-candidate-box {
   }
 }
 
+//
+// Mate OSD Window
+//
+MsdOsdWindow.background.osd {
+  border-radius: 2px;
+  border: 1px solid darken($osd_bg_color, 8%);
+
+  .progressbar {
+    background-color: $selected_bg_color;
+    border: none;
+    border-color: red;
+    border-radius: 5px;
+  }
+  .trough {
+    background-color: darken($osd_bg_color, 5%);
+    border: none;
+    border-radius: 5px;
+  }
+}
+
 //
 // Mate/Gnome Flashback Panel
 //
-- 
cgit v1.2.3


From 89ee9814221c50d1f6d78d58de228ed63b309194 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Fri, 30 Sep 2016 23:42:54 +0200
Subject: gnome-builder 3.22 fixes

---
 common/gtk-3.0/3.20/sass/_applications.scss | 54 +++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 5d221c4..62bcc17 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -319,6 +319,8 @@ pillbox {
   color: $selected_fg_color;
   background-color: $selected_bg_color;
   border-radius: 3px;
+
+  &:disabled label { color: transparentize($selected_fg_color, 0.5) }
 }
 
 docktabstrip {
@@ -365,6 +367,58 @@ dockoverlayedge {
   }
 }
 
+popover.messagepopover {
+  &.background { padding: 0; }
+
+  .popover-content-area { margin: 16px; }
+  .popover-action-area {
+    margin: 8px;
+
+    button:not(:first-child):not(:last-child) { margin: 0 4px; }
+  }
+}
+
+popover.popover-selector {
+  padding: 0;
+
+  list {
+    row { padding: 5px 0; }
+    row image { margin-left: 3px; margin-right: 10px; }
+  }
+}
+
+entry.search.preferences-search {
+  border: none;
+  border-right: 1px solid $borders_color;
+  border-bottom: 1px solid $borders_color;
+  border-radius: 0;
+}
+
+preferences stacksidebar.sidebar {
+  background-color: $base_color;
+
+  list separator { background-color: transparent; }
+}
+
+devhelppanel entry:focus,
+symboltreepanel entry:focus {
+  border-color: $borders_color
+}
+
+button.run-arrow-button {
+  min-width: 12px;
+}
+
+omnibar.linked > entry:not(:only-child) { border-style: solid; border-radius: 3px; margin-left: 1px; margin-right: 1px; }
+
+gstyleslidein {
+  #scale_box,
+  #strings_controls,
+  #palette_controls,
+  #components_controls {
+    button.toggle:checked { color: $fg_color; }
+  }
+}
 
 //
 // Epiphany
-- 
cgit v1.2.3


From bd67b3971233f87c42d1e6ac641e3371353287cd Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Sat, 1 Oct 2016 10:18:44 +0200
Subject: more builder tweaks

---
 common/gtk-3.0/3.20/sass/_applications.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'common/gtk-3.0/3.20/sass/_applications.scss')

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 62bcc17..7f1012d 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -285,6 +285,8 @@ $disk_space_free: darken($bg_color, 3%);
 //
 // Gnome Builder
 //
+// TODO: Merge this with the upstream stylesheet
+
 .gb-search-entry-occurrences-tag { background: none; }
 
 workbench.csd > stack.titlebar:not(headerbar) {
@@ -395,7 +397,7 @@ entry.search.preferences-search {
 }
 
 preferences stacksidebar.sidebar {
-  background-color: $base_color;
+  list { background-image: _solid($base_color); }
 
   list separator { background-color: transparent; }
 }
@@ -420,6 +422,11 @@ gstyleslidein {
   }
 }
 
+configurationview {
+  entry.flat { background: none; }
+  list { border-width: 0; }
+}
+
 //
 // Epiphany
 //
-- 
cgit v1.2.3