From 1b8a768279e1cf093b16c6c71965aa5cb1c80682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 16 Feb 2018 21:19:04 +0100 Subject: [PATCH] adwaita: Move searchbar style to box child This way, we avoid a 1px border at the bottom of the actual searchbar widget and move it instead to the child of a GtkRevealer. Since we can now use widgets with 0px height, we finally get rid of the 1px border that was drawn even if the searchbar child was hidden. --- gtk/theme/Adwaita/_common.scss | 6 +++++- gtk/theme/Adwaita/gtk-contained-dark.css | 12 +++++++----- gtk/theme/Adwaita/gtk-contained.css | 12 +++++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index f3d479f64f..3e28edd0f3 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1394,7 +1394,6 @@ toolbar { border-radius: 0 0 5px 5px; } -searchbar, .location-bar { @extend %toolbar; @@ -1408,6 +1407,11 @@ searchbar { padding: 0px; >revealer>box { padding: 6px; + @extend %toolbar; + + @extend %darkbar; + + border-width: 0 0 1px; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index d2552a9a60..ff8fa57b4d 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -565,7 +565,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 { padding: 4px; background-color: #33393b; } +toolbar, .inline-toolbar, .location-bar, searchbar > revealer > box { padding: 4px; background-color: #33393b; } toolbar { padding: 4px 3px 3px 4px; } @@ -583,13 +583,15 @@ 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: 0px; } +.location-bar { border-width: 0 0 1px; padding: 0px; } -searchbar > revealer > box { padding: 6px; } +searchbar { padding: 0px; } -.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #1b1f20; background-color: #2c3133; } +searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; } -.inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { border-color: #202425; background-color: #2c3233; box-shadow: none; transition: 200ms ease-out; } +.inline-toolbar, .location-bar, searchbar > revealer > box { border-style: solid; border-color: #1b1f20; background-color: #2c3133; } + +.inline-toolbar:backdrop, .location-bar:backdrop, searchbar > revealer > box: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 2f29e88149..df2b78bf86 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -573,7 +573,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 { padding: 4px; background-color: #e8e8e7; } +toolbar, .inline-toolbar, .location-bar, searchbar > revealer > box { padding: 4px; background-color: #e8e8e7; } toolbar { padding: 4px 3px 3px 4px; } @@ -591,13 +591,15 @@ 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: 0px; } +.location-bar { border-width: 0 0 1px; padding: 0px; } -searchbar > revealer > box { padding: 6px; } +searchbar { padding: 0px; } -.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #b6b6b3; background-color: #d9d9d7; } +searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; } -.inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { border-color: #c0c0bd; background-color: #dadad8; box-shadow: none; transition: 200ms ease-out; } +.inline-toolbar, .location-bar, searchbar > revealer > box { border-style: solid; border-color: #b6b6b3; background-color: #d9d9d7; } + +.inline-toolbar:backdrop, .location-bar:backdrop, searchbar > revealer > box: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); }