callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

theme: Be more selective when adding margins to toolbar items

Browse Source 
Only add margins to direct children of toolbar items, this fixes the
gaps between linked buttons inside custom toolbar items.

https://gitlab.gnome.org/GNOME/gtk/merge_requests/66
This commit is contained in:
Nikita Churaev 2018-03-18 13:33:52 +03:00 committed by Daniel Boles
parent 6551ddd8e0
commit ef3fe9ead3
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1382,11 +1382,10 @@ toolbar {
&.vertical separator { margin: 6px 1px 7px 0; }
&:not(.inline-toolbar):not(.osd) {
switch,
scale,
entry,
spinbutton,
button {
// workaround: add margins to the children of tool items to simulate
// spacing, ignore the overflow button (.toggle) and the overflow menu
// (.popup)
> *:not(.toggle):not(.popup) > * {
margin-right: 1px;
margin-bottom: 1px;
}

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

@ -567,7 +567,7 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; }
toolbar.vertical separator { margin: 6px 1px 7px 0; }
toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; }
toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; }
.inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }

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

@ -575,7 +575,7 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; }
toolbar.vertical separator { margin: 6px 1px 7px 0; }
toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; }
toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; }
.inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }