From 4fc5832cfdbc2783d582283d3568a0dacac68108 Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Fri, 18 Mar 2016 15:30:46 +0100
Subject: [PATCH] High Contrast: osd spinbutton fixes

- don't jump around for :backdrop
- only shade focused widgets
---
 gtk/theme/HighContrast/_common.scss              | 10 ++++++++--
 gtk/theme/HighContrast/gtk-contained-inverse.css | 13 +++++++++----
 gtk/theme/HighContrast/gtk-contained.css         | 13 +++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 928f6c7823..552f6e145b 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -957,6 +957,7 @@ spinbutton {
   .osd &:not(.vertical) {
     border-color: $osd_borders_color;
     color: $fg_color;
+    box-shadow: none;
     
     &:focus, &:active {
       border-color: opacify($osd_borders_color,0.5);
@@ -964,9 +965,12 @@ spinbutton {
     }
     
     entry {
-      box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
+      box-shadow: none;
       color: $fg_color;
       text-shadow: none;
+      &:focus, &:active {
+        box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
+      }
     }
     
     button {
@@ -992,9 +996,10 @@ spinbutton {
       &:backdrop {
         @include button(undecorated);
 
-        color: $osd_fg_color;
+        color: $insensitive_fg_color;
         border-color: transparentize($borders_color,0.9);
         box-shadow: none;
+        border-style: none none none solid;
       }
 
       &:disabled {
@@ -1002,6 +1007,7 @@ spinbutton {
 
         color: $insensitive_fg_color;
         border-color: transparentize($borders_color,0.9);
+        border-style: none none none solid;
         box-shadow: none;
       }
 
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 9a553774d1..b7e4af16cf 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -1104,14 +1104,17 @@ spinbutton:not(.vertical) {
         border-style: none solid none none; }
 .osd spinbutton:not(.vertical) {
   border-color: rgba(255, 255, 255, 0.2);
-  color: #fff; }
+  color: #fff;
+  box-shadow: none; }
   .osd spinbutton:not(.vertical):focus, .osd spinbutton:not(.vertical):active {
     border-color: rgba(255, 255, 255, 0.7);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
   .osd spinbutton:not(.vertical) entry {
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
+    box-shadow: none;
     color: #fff;
     text-shadow: none; }
+    .osd spinbutton:not(.vertical) entry:focus, .osd spinbutton:not(.vertical) entry:active {
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
   .osd spinbutton:not(.vertical) button {
     border-width: 2px;
     border-style: solid;
@@ -1144,12 +1147,14 @@ spinbutton:not(.vertical) {
       background-color: transparent;
       background-image: none;
       border-color: transparent;
-      color: #fff;
+      color: gray;
       border-color: rgba(128, 128, 128, 0.1);
-      box-shadow: none; }
+      box-shadow: none;
+      border-style: none none none solid; }
     .osd spinbutton:not(.vertical) button:disabled {
       color: gray;
       border-color: rgba(128, 128, 128, 0.1);
+      border-style: none none none solid;
       box-shadow: none; }
     .osd spinbutton:not(.vertical) button:last-child {
       border-radius: 0 3px 3px 0; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 29363db2ff..487bc2d1cd 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -1108,14 +1108,17 @@ spinbutton:not(.vertical) {
         border-style: none solid none none; }
 .osd spinbutton:not(.vertical) {
   border-color: rgba(255, 255, 255, 0.2);
-  color: #000; }
+  color: #000;
+  box-shadow: none; }
   .osd spinbutton:not(.vertical):focus, .osd spinbutton:not(.vertical):active {
     border-color: rgba(255, 255, 255, 0.7);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
   .osd spinbutton:not(.vertical) entry {
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
+    box-shadow: none;
     color: #000;
     text-shadow: none; }
+    .osd spinbutton:not(.vertical) entry:focus, .osd spinbutton:not(.vertical) entry:active {
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
   .osd spinbutton:not(.vertical) button {
     border-width: 2px;
     border-style: solid;
@@ -1148,12 +1151,14 @@ spinbutton:not(.vertical) {
       background-color: transparent;
       background-image: none;
       border-color: transparent;
-      color: #fff;
+      color: gray;
       border-color: rgba(128, 128, 128, 0.1);
-      box-shadow: none; }
+      box-shadow: none;
+      border-style: none none none solid; }
     .osd spinbutton:not(.vertical) button:disabled {
       color: gray;
       border-color: rgba(128, 128, 128, 0.1);
+      border-style: none none none solid;
       box-shadow: none; }
     .osd spinbutton:not(.vertical) button:last-child {
       border-radius: 0 3px 3px 0; }