summaryrefslogtreecommitdiff
path: root/gtk/theme/Adwaita
diff options
context:
space:
mode:
authorLapo Calamandrei <calamandrei@gmail.com>2016-11-03 18:52:54 +0100
committerMatthias Clasen <mclasen@redhat.com>2016-11-03 14:04:32 -0400
commit993f8677440292ccc22e1e41884d644ccb17e9eb (patch)
treec21693b0d2ab75f59d9d43866b21b08ac8adb8af /gtk/theme/Adwaita
parent3885e85f77901bfb75d5832cfe07f9a1284ecaa1 (diff)
downloadgtk+-993f8677440292ccc22e1e41884d644ccb17e9eb.tar.gz
Adwaita: correctly style headerbars in a stack
corners are correctly rounded now. Stacked splitted headerbars are not supported yet though.
Diffstat (limited to 'gtk/theme/Adwaita')
-rw-r--r--gtk/theme/Adwaita/_common.scss11
-rw-r--r--gtk/theme/Adwaita/gtk-contained-dark.css3
-rw-r--r--gtk/theme/Adwaita/gtk-contained.css3
3 files changed, 15 insertions, 2 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index e5d21a4093..e3d02a0d35 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1569,11 +1569,18 @@ headerbar {
}
}
-headerbar {
+headerbar { // headerbar border rounding
window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + &, // tackles the paned container case
window:not(.tiled):not(.maximized):not(.solid-csd) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }}
-
window:not(.tiled):not(.maximized):not(.solid-csd) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }}
+ window:not(.tiled):not(.maximized):not(.solid-csd) stack & { // tackles the stacked headerbars case
+ &:first-child, &:last-child {
+ &:backdrop, & {
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px;
+ }
+ }
+ }
}
.titlebar:not(headerbar) {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 04bbeb6941..400d6be9c7 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2022,6 +2022,9 @@ window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + heade
border-top-left-radius: 7px; }
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child {
border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child {
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px; }
window.csd > .titlebar:not(headerbar) {
padding: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index d8058cebea..879163ff05 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2031,6 +2031,9 @@ window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + heade
border-top-left-radius: 7px; }
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child {
border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child {
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px; }
window.csd > .titlebar:not(headerbar) {
padding: 0;