AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'toolbar-spacing-fix' into 'master'

Browse Source 
theme: Be more selective when adding margins to toolbar items

See merge request GNOME/gtk!66
This commit is contained in:
Daniel Boles 2018-03-22 20:54:01 +00:00
commit 563cb69c6d
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

@ -1372,11 +1372,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

@ -579,7 +579,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; color: red; background: green; }
.inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }

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

@ -587,7 +587,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; color: red; background: green; }
.inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }