diff options
| author | Lapo Calamandrei <calamandrei@gmail.com> | 2016-10-18 13:16:07 +0200 |
|---|---|---|
| committer | Lapo Calamandrei <calamandrei@gmail.com> | 2016-10-19 16:07:12 +0200 |
| commit | a1b7f36afa3f3fa96a5db4ad6cc4c623713c8885 (patch) | |
| tree | f54b6e9ea2a012a759f1c901c2b4855ef82a28fd | |
| parent | bec95e55e4b0aa40ec4aae7eccb85028cca19d9d (diff) | |
| download | gtk+-a1b7f36afa3f3fa96a5db4ad6cc4c623713c8885.tar.gz | |
Adwaita: sass cleanup
aggregate circular button style to the main button structure.
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 14 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 11 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 11 |
3 files changed, 17 insertions, 19 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 010b23dadc..49d5ef46bb 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -764,6 +764,13 @@ button { .linked.vertical > &:active, .linked.vertical > &:checked, .linked.vertical > &:backdrop { @extend %linked_vertical; } + + &.circular { // The Bloody Circul Button + border-radius: 9999px; + -gtk-outline-radius: 9999px; + + label { padding: 0; } + } } %needs_attention { @@ -4242,13 +4249,6 @@ cursor-handle { .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview -button.circular { // FIXME: aggregate to buttons - border-radius: 9999px; - -gtk-outline-radius: 9999px; - - label { padding: 0; } -} - // shortcut window keys .keycap { min-width: 20px; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 1ff6188827..e34b0ec192 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1153,6 +1153,11 @@ button:backdrop { .primary-toolbar button { -gtk-icon-shadow: none; } +button.circular { + border-radius: 9999px; + -gtk-outline-radius: 9999px; } + button.circular label { + padding: 0; } .stack-switcher > button.needs-attention > label, @@ -4508,12 +4513,6 @@ cursor-handle { .context-menu { font: initial; } -button.circular { - border-radius: 9999px; - -gtk-outline-radius: 9999px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 38f669825c..0f181e1826 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1156,6 +1156,11 @@ button:backdrop { .primary-toolbar button { -gtk-icon-shadow: none; } +button.circular { + border-radius: 9999px; + -gtk-outline-radius: 9999px; } + button.circular label { + padding: 0; } .stack-switcher > button.needs-attention > label, @@ -4539,12 +4544,6 @@ cursor-handle { .context-menu { font: initial; } -button.circular { - border-radius: 9999px; - -gtk-outline-radius: 9999px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; |