From b90fa7dcd18160ed060d0205872bdbe231410e80 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 18 Dec 2015 22:37:57 -0500
Subject: [PATCH] Adwaita: fix action bar styling

Make action bar buttons have some padding again.
---
 gtk/theme/Adwaita/_common.scss           | 7 +++++--
 gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++++--
 gtk/theme/Adwaita/gtk-contained.css      | 8 ++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c6e2a02a67..250dce1a45 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2514,11 +2514,14 @@ paper {
   &:backdrop { border-color: $backdrop_borders_color; }
 }
 
-actionbar frame {
-  padding: 6px;
+actionbar frame border {
   border-width: 1px 0 0;
 }
 
+actionbar box {
+  padding: 6px;
+}
+
 placessidebar,
 scrolledwindow {
   viewport.frame { // avoid double borders when viewport inside scrolled window
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index eadf160c6d..9db0bb5fd0 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2983,8 +2983,10 @@ checkbutton.text-button, radiobutton.text-button {
     checkbutton.text-button:insensitive:backdrop, checkbutton.text-button:insensitive:active:backdrop, checkbutton.text-button:insensitive:inconsistent:backdrop, radiobutton.text-button:insensitive:backdrop, radiobutton.text-button:insensitive:active:backdrop, radiobutton.text-button:insensitive:inconsistent:backdrop {
       color: #5d6767; }
 
+radiobutton radio,
 checkbutton check {
   margin: 0 2px 0 2px; }
+  radiobutton radio:only-child,
   checkbutton check:only-child {
     margin: 0; }
 
@@ -3504,10 +3506,12 @@ paper {
   paper:backdrop {
     border-color: #1f2222; }
 
-actionbar frame {
-  padding: 6px;
+actionbar frame border {
   border-width: 1px 0 0; }
 
+actionbar box {
+  padding: 6px; }
+
 placessidebar viewport.frame,
 scrolledwindow viewport.frame {
   border-style: none; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index d6d42b4d41..5d0a8334f2 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3145,8 +3145,10 @@ checkbutton.text-button, radiobutton.text-button {
     checkbutton.text-button:insensitive:backdrop, checkbutton.text-button:insensitive:active:backdrop, checkbutton.text-button:insensitive:inconsistent:backdrop, radiobutton.text-button:insensitive:backdrop, radiobutton.text-button:insensitive:active:backdrop, radiobutton.text-button:insensitive:inconsistent:backdrop {
       color: #c3c3c0; }
 
+radiobutton radio,
 checkbutton check {
   margin: 0 2px 0 2px; }
+  radiobutton radio:only-child,
   checkbutton check:only-child {
     margin: 0; }
 
@@ -3666,10 +3668,12 @@ paper {
   paper:backdrop {
     border-color: #a5a5a1; }
 
-actionbar frame {
-  padding: 6px;
+actionbar frame border {
   border-width: 1px 0 0; }
 
+actionbar box {
+  padding: 6px; }
+
 placessidebar viewport.frame,
 scrolledwindow viewport.frame {
   border-style: none; }