[gtk/gtk-3-22: 1/4] Fix the double border in windows with a search bar.

[Daniel Boles <dboles src gnome org>]

commit d465d790f0b425a391534df28548ff3fc3b9bb55
Author: Nikita Churaev <lamefun x0r gmail com>
Date:   Wed Mar 7 08:39:05 2018 +0300

    Fix the double border in windows with a search bar.
    
    Includes applications like GNOME Software and GNOME Documents. The
    search bar is a composite widget with a revealer inside it, and when the
    content of the revealer is hidden, the border lingers. Changed the CSS
    to add style to the content of the revealer instead of the search bar
    widget itself.

 gtk/theme/Adwaita/_common.scss           |  8 +++++++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 10 ++++++----
 gtk/theme/Adwaita/gtk-contained.css      | 10 ++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 45e5d46a0d..7059e37709 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1404,7 +1404,7 @@ toolbar {
   border-radius: 0  0 5px 5px;
 }
 
-searchbar,
+searchbar > revealer > *,
 .location-bar {
   @extend %toolbar;
 
@@ -1414,6 +1414,12 @@ searchbar,
   padding: 3px;
 }
 
+// workaround: undo the GTK+ margin and use CSS padding instead
+searchbar > revealer > * {
+  margin: -6px;
+  padding: 6px;
+}
+
 %darkbar {
   border-style: solid;
   border-color: $borders_color;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7e94ede784..7bc4f7238e 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -553,7 +553,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
-toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; 
background-color: #33393b; }
+toolbar, .inline-toolbar, searchbar > revealer > *, .location-bar { -GtkWidget-window-dragging: true; 
padding: 4px; background-color: #33393b; }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -571,11 +571,13 @@ toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(
 
 .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0  0 5px 5px; }
 
-searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > *, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #1b1f20; background-color: 
#2c3133; }
+searchbar > revealer > * { margin: -6px; padding: 6px; }
 
-.inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { border-color: #202425; 
background-color: #2c3233; box-shadow: none; transition: 200ms ease-out; }
+.inline-toolbar, searchbar > revealer > *, .location-bar { border-style: solid; border-color: #1b1f20; 
background-color: #2c3133; }
+
+.inline-toolbar:backdrop, searchbar > revealer > :backdrop, .location-bar:backdrop { border-color: #202425; 
background-color: #2c3233; box-shadow: none; transition: 200ms ease-out; }
 
 /*************** Header bars * */
 .titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: 
solid; border-color: #0b0c0c; border-radius: 0; background: #2c3133 linear-gradient(to top, #25292b, #2a2e30 
2px, #2c3133 3px); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 51d4ff4cb3..cc5d40fd45 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -561,7 +561,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
-toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; 
background-color: #e8e8e7; }
+toolbar, .inline-toolbar, searchbar > revealer > *, .location-bar { -GtkWidget-window-dragging: true; 
padding: 4px; background-color: #e8e8e7; }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -579,11 +579,13 @@ toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(
 
 .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0  0 5px 5px; }
 
-searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > *, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #b6b6b3; background-color: 
#d9d9d7; }
+searchbar > revealer > * { margin: -6px; padding: 6px; }
 
-.inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { border-color: #c0c0bd; 
background-color: #dadad8; box-shadow: none; transition: 200ms ease-out; }
+.inline-toolbar, searchbar > revealer > *, .location-bar { border-style: solid; border-color: #b6b6b3; 
background-color: #d9d9d7; }
+
+.inline-toolbar:backdrop, searchbar > revealer > :backdrop, .location-bar:backdrop { border-color: #c0c0bd; 
background-color: #dadad8; box-shadow: none; transition: 200ms ease-out; }
 
 /*************** Header bars * */
 .titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: 
solid; border-color: #91918c; border-radius: 0; background: #f4f4f4 linear-gradient(to top, #d4d4d2, #efefef 
2px, #f4f4f4 3px); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }