[gtk/wip/fanc999/gtk-3-24-meson-msvc: 18/297] Adwaita: Horizontal OSD spinbutton entry fix

[Chun-wei Fan <fanchunwei src gnome org>]

commit e4ef65702d47971f1deb2e039d045ea2137a9512
Author: Alex Monday <monday15 gmx com>
Date:   Mon Sep 10 17:58:01 2018 +0500

    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(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index e9818383d1..ff6ac56062 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1170,7 +1170,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;
@@ -1183,6 +1183,10 @@ spinbutton {
       &:backdrop:disabled { background-color: transparent; }
     }
 
+    entry {
+      @extend %spinbutton_horz_entry;
+    }
+
     button {
       min-height: 16px;
       margin: 0;
@@ -1235,6 +1239,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 b2a260d3b2..7abf47f0fc 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -493,7 +493,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 0c6cce1fa2..926a2b7bc1 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -501,7 +501,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; }