diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2018-09-10 08:57:54 +0000 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2018-09-10 08:57:54 +0000 |
| commit | 85a98d5d7c07ca75909fc1c5dad0674c0e88e033 (patch) | |
| tree | fcb8e6fe23852f31fed9478ee7dfa2d87e718451 | |
| parent | 87fa847b64e35d85ce0c7e2ec5f53958a50edc78 (diff) | |
| parent | f0696dfae03ba070f5436877e321f0392596a5b5 (diff) | |
| download | gtk+-85a98d5d7c07ca75909fc1c5dad0674c0e88e033.tar.gz | |
Merge branch 'nested-headerbar-3' into 'gtk-3-24'
Adwaita: Drop the background of nested headerbars
See merge request GNOME/gtk!322
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 11 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 2 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 44cc7c1cf6..05a4999a97 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1657,6 +1657,17 @@ headerbar { } } } + + &.titlebar headerbar:not(.titlebar) { + // Drop the background of non-titlebar nested headerbars. This is needed to + // work around headerbar sliding animation issues without refactoring + // Adwaita's support of titlebars and headerbars as it may break + // applications. + // See https://gitlab.gnome.org/GNOME/gtk/issues/1264 for more information. + background-color: rgba (0, 0, 0, 0); + background-image: none; + box-shadow: none; + } } headerbar { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index d162188c16..4b21a8f64c 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -660,6 +660,8 @@ searchbar > revealer > box { margin: -6px; padding: 6px; } .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd headerbar:backdrop:dir(rtl), .solid-csd headerbar:backdrop:dir(ltr), .solid-csd headerbar:dir(rtl), .solid-csd headerbar:dir(ltr) { margin-left: -1px; margin-right: -1px; margin-top: -1px; border-radius: 0; box-shadow: none; } +.titlebar:not(headerbar) headerbar:not(.titlebar), headerbar.titlebar headerbar:not(.titlebar) { background-color: rgba 0, 0, 0, 0; background-image: none; box-shadow: none; } + headerbar entry, headerbar spinbutton, headerbar separator, headerbar button { margin-top: 6px; margin-bottom: 6px; } headerbar switch { margin-top: 9px; margin-bottom: 9px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index e4e2ed5be8..6858a38635 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -668,6 +668,8 @@ searchbar > revealer > box { margin: -6px; padding: 6px; } .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd headerbar:backdrop:dir(rtl), .solid-csd headerbar:backdrop:dir(ltr), .solid-csd headerbar:dir(rtl), .solid-csd headerbar:dir(ltr) { margin-left: -1px; margin-right: -1px; margin-top: -1px; border-radius: 0; box-shadow: none; } +.titlebar:not(headerbar) headerbar:not(.titlebar), headerbar.titlebar headerbar:not(.titlebar) { background-color: rgba 0, 0, 0, 0; background-image: none; box-shadow: none; } + headerbar entry, headerbar spinbutton, headerbar separator, headerbar button { margin-top: 6px; margin-bottom: 6px; } headerbar switch { margin-top: 9px; margin-bottom: 9px; } |