diff options
| author | Daniel Boles <dboles.src@gmail.com> | 2018-03-22 20:54:01 +0000 |
|---|---|---|
| committer | Daniel Boles <dboles.src@gmail.com> | 2018-03-22 20:54:01 +0000 |
| commit | 563cb69c6d71e66249577fd4fcf9a6c54aca5ee4 (patch) | |
| tree | fe9d01ada3225a76f2925924ebf9d7bf3256e876 | |
| parent | b01ee88f11b85ef3370f5b70d0800abff561c163 (diff) | |
| parent | 0f13a232c69d146af2d61bb8cef5be203fc5ddbb (diff) | |
| download | gtk+-563cb69c6d71e66249577fd4fcf9a6c54aca5ee4.tar.gz | |
Merge branch 'toolbar-spacing-fix' into 'master'
theme: Be more selective when adding margins to toolbar items
See merge request GNOME/gtk!66
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 9 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 2 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 783df4fbf6..37f6d2f7ec 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -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; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index ff8fa57b4d..64c1cf075d 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -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; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index df2b78bf86..99e29c7d31 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -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; } |