From c9e20ae775d07023e9a6480d7775cef1c62f08f9 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 14 Sep 2015 12:08:55 +0200
Subject: revisit the linking logic

---
 common/gtk-3.0/3.14/sass/_common.scss  |  9 +++++++--
 common/gtk-3.0/3.14/sass/_drawing.scss | 14 +++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'common/gtk-3.0/3.14/sass')

diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index f97c1bc..cbf1fdd 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -932,12 +932,12 @@ GtkComboBox {
     &:dir(ltr) {
       border-right-style: none;
 
-      &:focus { box-shadow: 1px 0 $selected_bg_color; }
+      @if $variant=='light' { &:focus { box-shadow: 1px 0 $selected_bg_color; } }
     }
     &:dir(rtl) {
       border-left-style: none;
 
-      &:focus { box-shadow: -1px 0 $selected_bg_color; }
+      @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } }
     }
   }
 
@@ -2329,6 +2329,11 @@ GtkCalendar {
     &:hover {
       color: $fg_color;
     }
+    &:insensitive {
+      color: $insensitive_fg_color;
+      background-color: transparent;
+      background-image: none;
+    }
   }
   &.highlight { color: gtkalpha(currentColor,0.55); }
 }
diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss
index 73c4962..2b24642 100644
--- a/common/gtk-3.0/3.14/sass/_drawing.scss
+++ b/common/gtk-3.0/3.14/sass/_drawing.scss
@@ -37,9 +37,14 @@
   // focused entry
   //
     color: $text_color;
-    border-color: $selected_bg_color;
+    border-color: if($variant=='light', $selected_bg_color, $button_border);
     background-color: $entry_bg;
     background-image: linear-gradient(to bottom, $entry_bg);
+
+    @if $variant == 'dark' {
+      box-shadow: inset 1px 1px $selected_bg_color,
+                  inset -1px -1px $selected_bg_color;
+    }
   }
 
   @if $t==insensitive {
@@ -147,13 +152,8 @@
   //
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: saturate(mix($fg_color, $bg_color, 60%), 10%);
-    background-color: saturate(mix($fg_color, $bg_color, 60%), 10%);
 
-    //border-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), transparent);
-    //background-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), darken($button_bg, 10%));
-
-    border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+    border-color: if($variant=='light', $selected_bg_color, $button_border);
     background-color: $selected_bg_color;
   }
 
-- 
cgit v1.2.3