Merge branch 'master' of github.com:horst3180/arc-theme

1 files changed, 17 insertions, 27 deletions

diff --git a/common/gtk-3.0/3.20/sass/_drawing.scss b/common/gtk-3.0/3.20/sass/_drawing.scss
index 942e1fd..120a158 100644
--- a/common/gtk-3.0/3.20/sass/_drawing.scss
+++ b/common/gtk-3.0/3.20/sass/_drawing.scss
@@ -1,5 +1,10 @@
 // Drawing mixins
 
+// Solid color image
+@function _solid($c) {
+  @return linear-gradient(to bottom, $c, $c);
+}
+
 // Entries
 
 @mixin entry($t) {
@@ -16,7 +21,6 @@
     color: $text_color;
     border-color: $entry_border;
     background-color: $entry_bg;
-    background-image: linear-gradient(to bottom, $entry_bg);
   }
 
   @if $t==focus {
@@ -26,7 +30,6 @@
     color: $text_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 0 $selected_bg_color,
@@ -43,7 +46,6 @@
     color: $insensitive_fg_color;
     border-color: transparentize($entry_border, 0.45);
     background-color: transparentize($entry_bg, 0.45);
-    background-image: linear-gradient(to bottom, transparentize($entry_bg, 0.45));
   }
 
   @if $t==header-normal {
@@ -53,8 +55,7 @@
 
     color: $header_fg;
     border-color: $header_entry_border;
-    background-image: linear-gradient(to bottom, $header_entry_bg);
-    background-color: transparent;
+    background-color: $header_entry_bg;
 
     image, image:hover { color: inherit; }
   }
@@ -65,7 +66,7 @@
   //
     color: $selected_fg_color;
     border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
-    background-image: linear-gradient(to bottom, $selected_bg_color);
+    background-color: $selected_bg_color;
   }
 
   @if $t==header-insensitive {
@@ -73,7 +74,8 @@
   // insensitive header-bar entry
   //
     color: transparentize($header_fg, 0.45);
-    background-image: linear-gradient(to bottom, transparentize($header_entry_bg, 0.15));
+    border-color: $header_entry_border;
+    background-color: transparentize($header_entry_bg, 0.15);
   }
 
   @else if $t==osd {
@@ -82,8 +84,7 @@
   //
     color: $osd_fg_color;
     border-color: $osd_entry_border;
-    background-image: linear-gradient(to bottom, $osd_entry_bg);
-    background-color: transparent;
+    background-color: $osd_entry_bg;
 
     image, image:hover { color: inherit; }
   }
@@ -94,7 +95,7 @@
   //
     color: $selected_fg_color;
     border-color: $osd_entry_border;
-    background-image: linear-gradient(to bottom, $selected_bg_color);
+    background-color: $selected_bg_color;
   }
 
   @else if $t==osd-insensitive {
@@ -102,25 +103,24 @@
   // insensitive osd entry
   //
     color: transparentize($osd_fg_color, 0.45);
-    background-image: linear-gradient(to bottom, transparentize($osd_entry_bg, 0.15));
+    background-color: transparentize($osd_entry_bg, 0.15);
   }
 }
 
 // Buttons
 
-@mixin button($t, $actionb_color:red) {
+@mixin button($t, $actionb_bg:red, $actionb_fg: green) {
 //
 // Button drawing function
 //
 // $t:    button type,
-// $actionb_color: used for destructive and suggested action buttons
+// $actionb_bg, $actionb_fg: used for destructive and suggested action buttons
 
   @if $t==normal {
   //
   // normal button
   //
     color: $fg_color;
-    outline-color: transparentize($fg_color, 0.7);
     border-color: $button_border;
     background-color: $button_bg;
   }
@@ -130,7 +130,6 @@
   // hovered button
   //
     color: $fg_color;
-    outline-color: transparentize($fg_color, 0.7);
     border-color: $button_border;
     background-color: lighten($button_bg, 5%);
   }
@@ -140,8 +139,6 @@
   // pushed button
   //
     color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
-
     border-color: if($variant=='light', $selected_bg_color, $button_border);
     background-color: $selected_bg_color;
   }
@@ -173,7 +170,6 @@
   // normal header-bar button
   //
     color: $header_fg;
-    outline-color: transparentize($header_fg, 0.7);
     outline-offset: -3px;
     background-color: transparentize($header_bg, 1);
     border-color: transparentize($header_bg, 1);
@@ -184,7 +180,6 @@
   // hovered header-bar button
   //
     color: $header_fg;
-    outline-color: transparentize($header_fg, 0.7);
     border-color: $header_button_border;
     background-color: $header_button_bg;
   }
@@ -194,7 +189,6 @@
   // pushed header-bar button
   //
     color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
     border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
     background-color: $selected_bg_color;
   }
@@ -223,7 +217,6 @@
   // normal osd button
   //
     color: $osd_fg_color;
-    outline-color: transparentize($osd_fg_color, 0.7);
     border-color: $osd_button_border;
     background-color: $osd_button_bg;
   }
@@ -233,7 +226,6 @@
   // active osd button
   //
     color: $osd_fg_color;
-    outline-color: transparentize($osd_fg_color, 0.7);
     border-color: $osd_button_border;
     background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
   }
@@ -243,7 +235,6 @@
   // active osd button
   //
     color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
     border-color: $osd_button_border;
     background-color: $selected_bg_color;
   }
@@ -263,10 +254,9 @@
   //
     background-clip: border-box;
 
-    color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
-    background-color: $actionb_color;
-    border-color: $actionb_color;
+    color: $actionb_fg;
+    background-color: $actionb_bg;
+    border-color: $actionb_bg;
   }
 
   @else if $t==undecorated {