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.16/gtk-contained-dark.css         | 19 ++++++++-----------
 common/gtk-3.0/3.16/gtk-contained-darker.css       | 10 +++++-----
 common/gtk-3.0/3.16/gtk-contained-solid-dark.css   | 19 ++++++++-----------
 common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 10 +++++-----
 common/gtk-3.0/3.16/sass/_common.scss              |  4 ++--
 common/gtk-3.0/3.16/sass/_drawing.scss             |  9 +++++++--
 common/gtk-3.0/3.16/sass/_unity.scss               |  2 +-
 7 files changed, 36 insertions(+), 37 deletions(-)

(limited to 'common/gtk-3.0/3.16')

diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index e646807..f9f1f7f 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -163,9 +163,10 @@ GtkTextView {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
@@ -303,7 +304,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +534,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -780,7 +781,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -801,7 +802,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -846,12 +847,8 @@ GtkComboBox {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-      box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
     border-left-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-      box-shadow: -1px 0 #5294E2; }
   GtkComboBox.combobox-entry .button:dir(ltr) {
     box-shadow: inset 1px 0 #2b2e39; }
     GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
@@ -3510,7 +3507,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 439dcea..074a139 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +533,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -780,7 +780,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -801,7 +801,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -3510,7 +3510,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index f8fecc9..ecaf9ae 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -163,9 +163,10 @@ GtkTextView {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
@@ -303,7 +304,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +534,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -780,7 +781,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -801,7 +802,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -846,12 +847,8 @@ GtkComboBox {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-      box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
     border-left-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-      box-shadow: -1px 0 #5294E2; }
   GtkComboBox.combobox-entry .button:dir(ltr) {
     box-shadow: inset 1px 0 #2b2e39; }
     GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
@@ -3510,7 +3507,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 3a5a46f..38bbe40 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +533,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -780,7 +780,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -801,7 +801,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -3510,7 +3510,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index e55cea3..90c6063 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/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; } }
     }
   }
 
diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss
index 1e54c38..2b24642 100644
--- a/common/gtk-3.0/3.16/sass/_drawing.scss
+++ b/common/gtk-3.0/3.16/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 {
@@ -148,7 +153,7 @@
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
 
-    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;
   }
 
diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss
index 89439d2..c0b9060 100644
--- a/common/gtk-3.0/3.16/sass/_unity.scss
+++ b/common/gtk-3.0/3.16/sass/_unity.scss
@@ -47,7 +47,7 @@ UnityPanelWidget,
   color: lighten($panel_fg, 20%);
   box-shadow: none;
 
-  &:backdrop { color: darken($panel_fg, 5%); }
+  &:backdrop { color: lighten($panel_fg, 1%); }
 }
 
 .unity-panel.menubar.menuitem:hover,
-- 
cgit v1.2.3