[gtk: 1/2] theme: Be more selective when adding margins to toolbar items
- From: Daniel Boles <dboles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] theme: Be more selective when adding margins to toolbar items
- Date: Thu, 22 Mar 2018 20:55:09 +0000 (UTC)
commit 0f13a232c69d146af2d61bb8cef5be203fc5ddbb
Author: Nikita Churaev <lamefun x0r gmail com>
Date: Sun Mar 18 13:33:52 2018 +0300
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.
gtk/theme/Adwaita/_common.scss | 9 ++++-----
gtk/theme/Adwaita/gtk-contained-dark.css | 2 +-
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 3e28edd0f3..864ebc8501 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; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]