Commit ef3fe9ea authored by Nikita Churaev's avatar Nikita Churaev Committed by Daniel Boles

theme: Be more selective when adding margins to toolbar items

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

!66
parent 6551ddd8
......@@ -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;
}
......
......@@ -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; }
......
......@@ -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; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment