From aa14b187e0795f1f5a8a1672d88d7361d9f1c657 Mon Sep 17 00:00:00 2001 From: Alex Monday Date: Mon, 10 Sep 2018 18:22:09 +0500 Subject: Adwaita: Horizontal OSD spinbutton entry fix Add placeholder to hande horizontal spinbutton entries, add instructions for horizontal OSD spinbutton entry to use this placeholder. --- gtk/theme/Adwaita/_common.scss | 10 +++++++++- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'gtk/theme') diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 782d2e2d83..136c0bb6b3 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1142,7 +1142,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; @@ -1155,6 +1155,10 @@ spinbutton { &:backdrop:disabled { background-color: transparent; } } + entry { + @extend %spinbutton_horz_entry; + } + button { min-height: 16px; margin: 0; @@ -1207,6 +1211,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 6af8988573..9dad7fc277 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -499,7 +499,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 757ad18b92..c32561e16b 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -507,7 +507,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; } -- cgit v1.2.1