diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2019-01-29 09:39:57 +0000 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2019-01-29 09:39:57 +0000 |
| commit | 7286ede49089edab5a74bdf9df668c89895f4234 (patch) | |
| tree | 4ec345e8faf2925d9b0963c44e52d24fa5b59e90 /gtk/theme | |
| parent | 4a333f826a74dd654d27236246f22c44e942be87 (diff) | |
| parent | aa14b187e0795f1f5a8a1672d88d7361d9f1c657 (diff) | |
| download | gtk+-7286ede49089edab5a74bdf9df668c89895f4234.tar.gz | |
Merge branch 'adwaita-osd-spinbutton-entry-fix-master' into 'master'
Horizontal OSD spinbutton entry fix
See merge request GNOME/gtk!332
Diffstat (limited to 'gtk/theme')
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 10 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 2 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 369b651cb9..567d3a4aa5 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1157,7 +1157,7 @@ spinbutton { padding: 0; - entry { + %spinbutton_horz_entry { min-width: 28px; // reset all the other props since the spinbutton node is styled here margin: 0; @@ -1170,6 +1170,10 @@ spinbutton { &:backdrop:disabled { background-color: transparent; } } + entry { + @extend %spinbutton_horz_entry; + } + button { min-height: 16px; margin: 0; @@ -1222,6 +1226,10 @@ spinbutton { // OSD horizontal .osd &:not(.vertical) { + entry { + @extend %spinbutton_horz_entry; + } + button { @include button(undecorated); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 814067a29a..94ffb1f45d 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -505,7 +505,7 @@ button:link > label, button:visited > label { text-decoration-line: underline; } /***************** GtkSpinButton * */ spinbutton:not(.vertical) { padding: 0; } -spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; } +spinbutton:not(.vertical) entry, .osd spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; } spinbutton:not(.vertical) entry:backdrop:disabled { background-color: transparent; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index d120401504..d5af669151 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -513,7 +513,7 @@ button:link > label, button:visited > label { text-decoration-line: underline; } /***************** GtkSpinButton * */ spinbutton:not(.vertical) { padding: 0; } -spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; } +spinbutton:not(.vertical) entry, .osd spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; } spinbutton:not(.vertical) entry:backdrop:disabled { background-color: transparent; } |