dialog button spacing

 - set -GtkDialog-button-spacing: 4 globally and set it to 0 for message dialogs

3 files changed, 17 insertions, 3 deletions

diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 7ded677b..d47b0a84 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -37,7 +37,7 @@
   -GtkWindow-resize-grip-width: 0;
   -GtkWindow-resize-grip-height: 0;
   
-  -GtkDialog-button-spacing: 0;
+  -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
 
   // We use the outline properties to signal the focus properties
@@ -654,6 +654,7 @@ column-header { // FIXME: something better
     background-image: none;
     background-color: $base_color;
     color: mix($fg_color,$base_color,50%);
+    text-shadow: none;
     font-weight: bold;
   }
 }
@@ -1465,6 +1466,11 @@ GtkCalendar {
  * Dialogs *
  ***********/
 
+.message-dialog {
+  // no spacing in message dialogs and the likes
+  -GtkDialog-button-spacing: 0;
+}
+
 GtkMessageDialog .titlebar {
   border-style: none;
   box-shadow: inset 0 1px $borders_edge;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 5915d07a..f7760aa8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -53,7 +53,7 @@
   -GtkWidget-focus-line-width: 1;
   -GtkWindow-resize-grip-width: 0;
   -GtkWindow-resize-grip-height: 0;
-  -GtkDialog-button-spacing: 0;
+  -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   outline-color: rgba(238, 238, 236, 0.3);
   outline-style: dashed;
@@ -740,6 +740,7 @@ column-header .button:backdrop {
   background-image: none;
   background-color: #333333;
   color: #90908f;
+  text-shadow: none;
   font-weight: bold; }
 
 /*********
@@ -1656,6 +1657,9 @@ GtkCalendar {
 /***********
  * Dialogs *
  ***********/
+.message-dialog {
+  -GtkDialog-button-spacing: 0; }
+
 GtkMessageDialog .titlebar {
   border-style: none;
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 98d69b4b..095edb5e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -53,7 +53,7 @@
   -GtkWidget-focus-line-width: 1;
   -GtkWindow-resize-grip-width: 0;
   -GtkWindow-resize-grip-height: 0;
-  -GtkDialog-button-spacing: 0;
+  -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   outline-color: rgba(46, 52, 54, 0.3);
   outline-style: dashed;
@@ -740,6 +740,7 @@ column-header .button:backdrop {
   background-image: none;
   background-color: white;
   color: #96999a;
+  text-shadow: none;
   font-weight: bold; }
 
 /*********
@@ -1656,6 +1657,9 @@ GtkCalendar {
 /***********
  * Dialogs *
  ***********/
+.message-dialog {
+  -GtkDialog-button-spacing: 0; }
+
 GtkMessageDialog .titlebar {
   border-style: none;
   box-shadow: inset 0 1px white; }