fix background-clip on buttons and entries

12 files changed, 35 insertions, 13 deletions

diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss
index be91dfb..98520ff 100644
--- a/common/gtk-3.0/3.14/_common.scss
+++ b/common/gtk-3.0/3.14/_common.scss
@@ -232,7 +232,10 @@ GtkFlowBox .grid-child {
     border-radius: 0;
   }
 
-  &:focus { @include entry(focus); }
+  &:focus {
+    background-clip: border-box;
+    @include entry(focus);
+  }
 
   &:insensitive { @include entry(insensitive); }
 
@@ -410,6 +413,7 @@ $_dot_color: $selected_bg_color;
     -gtk-image-effect: highlight;
   }
   &:active, &:checked {
+    background-clip: border-box;
     @include button(active);
     transition-duration: 50ms;
   }
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 9106a20..b4bf8a5 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -157,6 +157,7 @@ GtkFlowBox .grid-child {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #D3DAE3;
     border-color: #5294E2;
     background-color: #383c45;
@@ -275,6 +276,7 @@ GtkFlowBox .grid-child {
     background-color: #3d414b;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index f3f0e0e..17c0f88 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -157,6 +157,7 @@ GtkFlowBox .grid-child {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #5c616c;
     border-color: #5294E2;
     background-color: #ffffff;
@@ -275,6 +276,7 @@ GtkFlowBox .grid-child {
     background-color: #fbfbfc;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index a4865a2..b77d909 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -157,6 +157,7 @@ GtkFlowBox .grid-child {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #D3DAE3;
     border-color: #5294E2;
     background-color: #383c45;
@@ -275,6 +276,7 @@ GtkFlowBox .grid-child {
     background-color: #3d414b;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 08030f9..3782119 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -157,6 +157,7 @@ GtkFlowBox .grid-child {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #5c616c;
     border-color: #5294E2;
     background-color: #ffffff;
@@ -275,6 +276,7 @@ GtkFlowBox .grid-child {
     background-color: #fbfbfc;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 8a75691..3017f8a 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -157,6 +157,7 @@ GtkFlowBox .grid-child {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #5c616c;
     border-color: #5294E2;
     background-color: #ffffff;
@@ -275,6 +276,7 @@ GtkFlowBox .grid-child {
     background-color: #fbfbfc;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index 1b15c33..b4832dc 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -232,7 +232,10 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     border-radius: 0;
   }
 
-  &:focus { @include entry(focus); }
+  &:focus {
+    background-clip: border-box;
+    @include entry(focus);
+  }
 
   &:insensitive { @include entry(insensitive); }
 
@@ -410,6 +413,7 @@ $_dot_color: $selected_bg_color;
     -gtk-image-effect: highlight;
   }
   &:active, &:checked {
+    background-clip: border-box;
     @include button(active);
     transition-duration: 50ms;
   }
@@ -1189,7 +1193,6 @@ GtkComboBox {
 
     &:focus {
       @include entry(header-focus);
-      background-clip: border-box;
 
       &.image { color: $selected_fg_color; }
     }
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 3c7f2de..1764f6a 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -157,6 +157,7 @@ GtkTextView {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #D3DAE3;
     border-color: #5294E2;
     background-color: #383c45;
@@ -275,6 +276,7 @@ GtkTextView {
     background-color: #3d414b;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
@@ -899,8 +901,7 @@ GtkComboBox {
   .primary-toolbar .entry:focus, .header-bar .entry:focus {
     color: #ffffff;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2);
-    background-clip: border-box; }
+    background-image: linear-gradient(to bottom, #5294E2); }
     .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image {
       color: #ffffff; }
   .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive {
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 7d59919..2ef74c8 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -157,6 +157,7 @@ GtkTextView {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #5c616c;
     border-color: #5294E2;
     background-color: #ffffff;
@@ -275,6 +276,7 @@ GtkTextView {
     background-color: #fbfbfc;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
@@ -899,8 +901,7 @@ GtkComboBox {
   .primary-toolbar .entry:focus, .header-bar .entry:focus {
     color: #ffffff;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2);
-    background-clip: border-box; }
+    background-image: linear-gradient(to bottom, #5294E2); }
     .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image {
       color: #ffffff; }
   .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive {
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 84f29d8..ca862be 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
@@ -157,6 +157,7 @@ GtkTextView {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #D3DAE3;
     border-color: #5294E2;
     background-color: #383c45;
@@ -275,6 +276,7 @@ GtkTextView {
     background-color: #3d414b;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
@@ -899,8 +901,7 @@ GtkComboBox {
   .primary-toolbar .entry:focus, .header-bar .entry:focus {
     color: #ffffff;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2);
-    background-clip: border-box; }
+    background-image: linear-gradient(to bottom, #5294E2); }
     .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image {
       color: #ffffff; }
   .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 0b8785a..e71b521 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -157,6 +157,7 @@ GtkTextView {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #5c616c;
     border-color: #5294E2;
     background-color: #ffffff;
@@ -275,6 +276,7 @@ GtkTextView {
     background-color: #fbfbfc;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
@@ -899,8 +901,7 @@ GtkComboBox {
   .primary-toolbar .entry:focus, .header-bar .entry:focus {
     color: #ffffff;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2);
-    background-clip: border-box; }
+    background-image: linear-gradient(to bottom, #5294E2); }
     .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image {
       color: #ffffff; }
   .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive {
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 49ad599..a685262 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -157,6 +157,7 @@ GtkTextView {
     border: none;
     border-radius: 0; }
   .entry:focus {
+    background-clip: border-box;
     color: #5c616c;
     border-color: #5294E2;
     background-color: #ffffff;
@@ -275,6 +276,7 @@ GtkTextView {
     background-color: #fbfbfc;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
@@ -899,8 +901,7 @@ GtkComboBox {
   .primary-toolbar .entry:focus, .header-bar .entry:focus {
     color: #ffffff;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2);
-    background-clip: border-box; }
+    background-image: linear-gradient(to bottom, #5294E2); }
     .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image {
       color: #ffffff; }
   .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive {