action-bar: got overriden by .frame {}

- set image-button and text-button padding globally
  same for headerbars and actionbars

3 files changed, 21 insertions, 28 deletions

diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 3947aeb9..7929c3e9 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -272,17 +272,10 @@
       }
     }
   }
-
-  // headerbar buttons
-  .header-bar & {
-    &.text-button {
-      padding: 6px 8px 5px; // due to font metrics the image buttons
-                            // are 1px shorter
-    }
-    &.image-button {
-      padding: 8px;
-    }
-  }
+  
+  //buttons in header bars and action bars
+    &.image-button { padding: 8px; }
+  &.text-button { padding: 6px 8px 5px; } // due to font metrics the image buttons
 
   //inline-toolbar buttons
   .inline-toolbar &, .inline-toolbar &:backdrop {
@@ -562,10 +555,6 @@ GtkComboBox {
   }
 }
 
-.action-bar {
-  padding: 4px;
-}
-
 /***************
  * Header bars *
  ***************/
@@ -1408,8 +1397,12 @@ GtkLevelBar.vertical {
  **********/
 .frame {
   border: 1px solid $borders_color;
-  padding: 0;
   &:backdrop { border-color: $backdrop_borders_color; }
+  padding: 0;
+  &.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0;
+  }
 }
 
 GtkScrolledWindow {
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 1f971e1e..ce3789db 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -408,10 +408,10 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-  .header-bar .button.text-button {
-    padding: 6px 8px 5px; }
-  .header-bar .button.image-button {
+  .button.image-button {
     padding: 8px; }
+  .button.text-button {
+    padding: 6px 8px 5px; }
   .inline-toolbar .button, .inline-toolbar .button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
@@ -672,9 +672,6 @@ GtkComboBox {
     background-color: #2f3434;
     box-shadow: none; }
 
-.action-bar {
-  padding: 4px; }
-
 /***************
  * Header bars *
  ***************/
@@ -1703,6 +1700,9 @@ GtkLevelBar.vertical {
   padding: 0; }
   .frame:backdrop {
     border-color: #1e2222; }
+  .frame.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0; }
 
 GtkScrolledWindow .frame {
   border-radius: 2px; }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 3203485d..02b29d33 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -408,10 +408,10 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-  .header-bar .button.text-button {
-    padding: 6px 8px 5px; }
-  .header-bar .button.image-button {
+  .button.image-button {
     padding: 8px; }
+  .button.text-button {
+    padding: 6px 8px 5px; }
   .inline-toolbar .button, .inline-toolbar .button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
@@ -672,9 +672,6 @@ GtkComboBox {
     background-color: #d4d4d4;
     box-shadow: none; }
 
-.action-bar {
-  padding: 4px; }
-
 /***************
  * Header bars *
  ***************/
@@ -1703,6 +1700,9 @@ GtkLevelBar.vertical {
   padding: 0; }
   .frame:backdrop {
     border-color: #a8a8a8; }
+  .frame.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0; }
 
 GtkScrolledWindow .frame {
   border-radius: 2px; }