Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adwaita: Fix menubutton in headerbar margins

Browse Source 
Add the margins to the menubutton and not the button inside the
menubutton. This way popovers properly point to the inner button again
instead to somewhere 6px off.
This commit is contained in:
Timm Bäder
2019-10-18 11:44:32 +02:00
parent 350495cf1c
commit ca71340c6b
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/theme/Adwaita/_common.scss
View File

@@ -1695,10 +1695,18 @@ headerbar {
entry,
spinbutton,
separator:not(.sidebar),
button {
button,
menubutton {
margin-top: 6px;
margin-bottom: 6px;
}
// Reset margins for buttons inside menubutton
menubutton > button {
margin-top: 0px;
margin-bottom: 0px;
}
switch {
margin-top: 10px;
margin-bottom: 10px;

4
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@@ -705,7 +705,9 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; }
.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; }
headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button { margin-top: 6px; margin-bottom: 6px; }
headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button, headerbar menubutton { margin-top: 6px; margin-bottom: 6px; }
headerbar menubutton > button { margin-top: 0px; margin-bottom: 0px; }
headerbar switch { margin-top: 10px; margin-bottom: 10px; }

4
gtk/theme/Adwaita/gtk-contained.css
View File

@@ -713,7 +713,9 @@ searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; }
.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; }
headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button { margin-top: 6px; margin-bottom: 6px; }
headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button, headerbar menubutton { margin-top: 6px; margin-bottom: 6px; }
headerbar menubutton > button { margin-top: 0px; margin-bottom: 0px; }
headerbar switch { margin-top: 10px; margin-bottom: 10px; }