nicer button padding

7 files changed, 103 insertions, 57 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 504b51c..56f0b02 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -285,16 +285,22 @@ button {
       button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked {
         color: rgba(255, 255, 255, 0.8); }
   button.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0; }
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px; }
   button.text-button {
-    padding-left: 16px;
-    padding-right: 16px; }
+    padding-left: 12px;
+    padding-right: 12px; }
   button.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px; }
-    button.text-button.image-button label {
+    padding-left: 5px;
+    padding-right: 5px; }
+    button.text-button.image-button label:first-child {
+      padding-left: 8px;
+      padding-right: 2px; }
+    button.text-button.image-button label:last-child {
+      padding-right: 8px;
+      padding-left: 2px; }
+    button.text-button.image-button label:only-child {
       padding-left: 8px;
       padding-right: 8px; }
   button:drop(active), combobox:drop(active) button.combo {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 22e5ca3..95d719a 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -284,16 +284,22 @@ button {
       button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked {
         color: rgba(255, 255, 255, 0.8); }
   button.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0; }
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px; }
   button.text-button {
-    padding-left: 16px;
-    padding-right: 16px; }
+    padding-left: 12px;
+    padding-right: 12px; }
   button.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px; }
-    button.text-button.image-button label {
+    padding-left: 5px;
+    padding-right: 5px; }
+    button.text-button.image-button label:first-child {
+      padding-left: 8px;
+      padding-right: 2px; }
+    button.text-button.image-button label:last-child {
+      padding-right: 8px;
+      padding-left: 2px; }
+    button.text-button.image-button label:only-child {
       padding-left: 8px;
       padding-right: 8px; }
   button:drop(active), combobox:drop(active) button.combo {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 822f11e..f1cbac1 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -285,16 +285,22 @@ button {
       button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked {
         color: rgba(255, 255, 255, 0.8); }
   button.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0; }
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px; }
   button.text-button {
-    padding-left: 16px;
-    padding-right: 16px; }
+    padding-left: 12px;
+    padding-right: 12px; }
   button.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px; }
-    button.text-button.image-button label {
+    padding-left: 5px;
+    padding-right: 5px; }
+    button.text-button.image-button label:first-child {
+      padding-left: 8px;
+      padding-right: 2px; }
+    button.text-button.image-button label:last-child {
+      padding-right: 8px;
+      padding-left: 2px; }
+    button.text-button.image-button label:only-child {
       padding-left: 8px;
       padding-right: 8px; }
   button:drop(active), combobox:drop(active) button.combo {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 51dffc6..7abab4f 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -284,16 +284,22 @@ button {
       button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked {
         color: rgba(255, 255, 255, 0.8); }
   button.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0; }
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px; }
   button.text-button {
-    padding-left: 16px;
-    padding-right: 16px; }
+    padding-left: 12px;
+    padding-right: 12px; }
   button.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px; }
-    button.text-button.image-button label {
+    padding-left: 5px;
+    padding-right: 5px; }
+    button.text-button.image-button label:first-child {
+      padding-left: 8px;
+      padding-right: 2px; }
+    button.text-button.image-button label:last-child {
+      padding-right: 8px;
+      padding-left: 2px; }
+    button.text-button.image-button label:only-child {
       padding-left: 8px;
       padding-right: 8px; }
   button:drop(active), combobox:drop(active) button.combo {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 1f6dfe2..dc7c0cf 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -284,16 +284,22 @@ button {
       button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked {
         color: rgba(255, 255, 255, 0.8); }
   button.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0; }
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px; }
   button.text-button {
-    padding-left: 16px;
-    padding-right: 16px; }
+    padding-left: 12px;
+    padding-right: 12px; }
   button.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px; }
-    button.text-button.image-button label {
+    padding-left: 5px;
+    padding-right: 5px; }
+    button.text-button.image-button label:first-child {
+      padding-left: 8px;
+      padding-right: 2px; }
+    button.text-button.image-button label:last-child {
+      padding-right: 8px;
+      padding-left: 2px; }
+    button.text-button.image-button label:only-child {
       padding-left: 8px;
       padding-right: 8px; }
   button:drop(active), combobox:drop(active) button.combo {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 073e562..1fa38a6 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -284,16 +284,22 @@ button {
       button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked {
         color: rgba(255, 255, 255, 0.8); }
   button.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0; }
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px; }
   button.text-button {
-    padding-left: 16px;
-    padding-right: 16px; }
+    padding-left: 12px;
+    padding-right: 12px; }
   button.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px; }
-    button.text-button.image-button label {
+    padding-left: 5px;
+    padding-right: 5px; }
+    button.text-button.image-button label:first-child {
+      padding-left: 8px;
+      padding-right: 2px; }
+    button.text-button.image-button label:last-child {
+      padding-right: 8px;
+      padding-left: 2px; }
+    button.text-button.image-button label:only-child {
       padding-left: 8px;
       padding-right: 8px; }
   button:drop(active), combobox:drop(active) button.combo {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 86d1f3f..e30151d 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -381,23 +381,33 @@ button {
   }
 
   &.image-button {
-    min-width: 32px;
-    padding-left: 0;
-    padding-right: 0;
+    min-width: 24px;
+    padding-left: 5px;
+    padding-right: 5px;
   }
 
   &.text-button {
-    padding-left: 16px;
-    padding-right: 16px;
+    padding-left: 12px;
+    padding-right: 12px;
   }
 
   &.text-button.image-button {
-    padding-left: 8px;
-    padding-right: 8px;
+    padding-left: 5px;
+    padding-right: 5px;
 
     label {
-      padding-left: 8px;
-      padding-right: 8px;
+      &:first-child {
+        padding-left: 8px;
+        padding-right: 2px;
+      }
+      &:last-child {
+        padding-right: 8px;
+        padding-left: 2px;
+      }
+      &:only-child {
+        padding-left: 8px;
+        padding-right: 8px;
+      }
     }
   }