[gtk/gtk-3-22: 3/4] Tidy up the search bar double border fix

[Daniel Boles <dboles src gnome org>]

commit 4e2f59ad2308b3877e244809c8fb323092690a88
Author: Nikita Churaev <lamefun x0r gmail com>
Date:   Fri Mar 9 22:13:01 2018 +0300

    Tidy up the search bar double border fix
    
    Match "box" instead of "*", as already done for the search bar GTK4 and
    for the action box in GTK3. Also clarify which widget property is
    causing the margin which needs to be undone.

 gtk/theme/Adwaita/_common.scss           |  6 +++---
 gtk/theme/Adwaita/gtk-contained-dark.css | 10 +++++-----
 gtk/theme/Adwaita/gtk-contained.css      | 10 +++++-----
 gtk/theme/HighContrast/_common.scss      |  4 +++-
 4 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7059e37709..5741da391a 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 > revealer > *,
+searchbar > revealer > box,
 .location-bar {
   @extend %toolbar;
 
@@ -1414,8 +1414,8 @@ searchbar > revealer > *,
   padding: 3px;
 }
 
-// workaround: undo the GTK+ margin and use CSS padding instead
-searchbar > revealer > * {
+searchbar > revealer > box {
+  // workaround: undo the GtkContainer::border-width and use CSS padding instead
   margin: -6px;
   padding: 6px;
 }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7bc4f7238e..6de23b77bd 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 > revealer > *, .location-bar { -GtkWidget-window-dragging: true; 
padding: 4px; background-color: #33393b; }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; 
padding: 4px; background-color: #33393b; }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -571,13 +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 > revealer > *, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-searchbar > revealer > * { margin: -6px; padding: 6px; }
+searchbar > revealer > box { margin: -6px; padding: 6px; }
 
-.inline-toolbar, searchbar > revealer > *, .location-bar { border-style: solid; border-color: #1b1f20; 
background-color: #2c3133; }
+.inline-toolbar, searchbar > revealer > box, .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; }
+.inline-toolbar:backdrop, searchbar > revealer > box: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 cc5d40fd45..d528d74094 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 > revealer > *, .location-bar { -GtkWidget-window-dragging: true; 
padding: 4px; background-color: #e8e8e7; }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; 
padding: 4px; background-color: #e8e8e7; }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -579,13 +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 > revealer > *, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-searchbar > revealer > * { margin: -6px; padding: 6px; }
+searchbar > revealer > box { margin: -6px; padding: 6px; }
 
-.inline-toolbar, searchbar > revealer > *, .location-bar { border-style: solid; border-color: #b6b6b3; 
background-color: #d9d9d7; }
+.inline-toolbar, searchbar > revealer > box, .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; }
+.inline-toolbar:backdrop, searchbar > revealer > box: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); }
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index fd10ceca33..a72fe67053 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1172,11 +1172,13 @@ toolbar { //FIXME: why is all this being ignored?
   }
 }
 
-searchbar > revealer > * {
+searchbar > revealer > box {
   @extend toolbar;
   border-width: 0 0 1px;
   border-color: $borders_color;
   border-style: none none solid none;
+
+  // workaround: undo the GtkContainer::border-width and use CSS padding instead
   margin: -6px;
   padding: 9px;
 }