From e7726994eed6ec5e021ebfc794e5ef27e22429b2 Mon Sep 17 00:00:00 2001
From: SammysHP <sven@sammyshp.de>
Date: Sat, 16 Apr 2016 21:34:20 +0200
Subject: [PATCH] Fix various button paddings

Still not perfect, but looks better than before. The whole area should
be refactored as the extends and overrides are a bit ugly.
---
 gtk-3.20/scss/widgets/_button.scss  | 9 ++-------
 gtk-3.20/scss/widgets/_toolbar.scss | 8 ++++----
 gtk-3.20/scss/widgets/_view.scss    | 2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/gtk-3.20/scss/widgets/_button.scss b/gtk-3.20/scss/widgets/_button.scss
index 6afc675..02a4d9e 100755
--- a/gtk-3.20/scss/widgets/_button.scss
+++ b/gtk-3.20/scss/widgets/_button.scss
@@ -45,7 +45,7 @@
     }
 
     %button {
-        padding: $spacing ($spacing + 2px);
+        padding: $spacing ($spacing * 1.4);
         border-width: 1px;
         border-style: solid;
         border-radius: $roundness;
@@ -262,15 +262,12 @@
     }
 
     button {
-        min-height: 22px;
-        min-width: 24px;
         @include button(shade($bg_color, 1.2), $fg_color);
 
         &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); }
 
         spinbutton & {
             color: mix($text_color, $base_color, .4);
-            padding: $spacing ($spacing * 2);
             border: 0;
             border-radius: 0;
             border-style: none;
@@ -360,8 +357,7 @@
         button.combo {
             // otherwise the arrow placement is not symmetric
             min-width: 0;
-            padding-left: 8px;
-            padding-right: 8px;
+            padding: ($spacing - 2px) ($spacing + 1px);
         }
 
         arrow {
@@ -372,7 +368,6 @@
 
         box button, box entry {
             @extend %linked_button;
-            padding: ($spacing - 2px) ($spacing + 1px);
         }
 
         .linked:not(.vertical) > & > box > button.combo {
diff --git a/gtk-3.20/scss/widgets/_toolbar.scss b/gtk-3.20/scss/widgets/_toolbar.scss
index be53207..b1dad13 100755
--- a/gtk-3.20/scss/widgets/_toolbar.scss
+++ b/gtk-3.20/scss/widgets/_toolbar.scss
@@ -9,7 +9,7 @@
     @include linear-gradient($bg);
     @include border($bg);
 
-    padding: $spacing * 2;
+    padding: $spacing;
     color: $fg;
 
     &:disabled {
@@ -33,11 +33,11 @@
     button.linked, .linked button { @include linked_button($bg); }
 
     combobox, button {
-        padding: $spacing - 1px;
+        padding: $spacing - 1px; // FIXME Why override everything, must be applied again for .text-button
 
-        &.text-button { padding: $spacing; }
+        &.text-button { padding: $spacing ($spacing * 1.4); }
 
-        &.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; }
+        &.image-button { padding: $spacing; } // FIXME Side effect with toolbar, order important (toolbar buttons might have both, text-button and image-button)
     }
 
     // toolbar separators
diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss
index 0e745c7..3106094 100644
--- a/gtk-3.20/scss/widgets/_view.scss
+++ b/gtk-3.20/scss/widgets/_view.scss
@@ -59,7 +59,7 @@
     }
 
     %column_header_button {
-        padding: 0 6px;
+        padding: ($spacing * 0.5) $spacing ($spacing * 0.2) $spacing;
         border-radius: 0;
         background-image: none;
         text-shadow: none;