[meld/ui-next] Remove GtkActionBar use in favour of plain GtkBox

[Kai Willadsen <kaiw src gnome org>]

commit 69abd9efaac166afac5317324ee69711b85c14bf
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Mar 1 11:49:09 2019 +1000

    Remove GtkActionBar use in favour of plain GtkBox
    
    The action bar doesn't actually get us anything significant, and it's
    hard-styled to have a top border, which absolutely doesn't work for us
    here.

 data/meld.css                 | 4 ++++
 meld/resources/ui/dirdiff.ui  | 6 +++++-
 meld/resources/ui/filediff.ui | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/data/meld.css b/data/meld.css
index d5913abf..95734b2e 100644
--- a/data/meld.css
+++ b/data/meld.css
@@ -10,6 +10,10 @@
     padding: 3px 2px 2px 2px;
 }
 
+.meld-actionbar {
+  padding: 6px;
+}
+
 .prefs-list-widget-toolbar {
     background-image: none;
     background-color: @theme_bg_color;
diff --git a/meld/resources/ui/dirdiff.ui b/meld/resources/ui/dirdiff.ui
index b245f0ef..fdc65e20 100644
--- a/meld/resources/ui/dirdiff.ui
+++ b/meld/resources/ui/dirdiff.ui
@@ -6,9 +6,13 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkActionBar">
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <style>
+          <class name="meld-actionbar"/>
+        </style>
         <child>
           <object class="GtkButton">
             <property name="visible">True</property>
diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui
index 55fa23bb..20a6ef0e 100644
--- a/meld/resources/ui/filediff.ui
+++ b/meld/resources/ui/filediff.ui
@@ -9,9 +9,13 @@
     <signal name="key-press-event" handler="on_key_event" swapped="no"/>
     <signal name="key-release-event" handler="on_key_event" swapped="no"/>
     <child>
-      <object class="GtkActionBar">
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <style>
+          <class name="meld-actionbar"/>
+        </style>
         <child>
           <object class="GtkButton">
             <property name="visible">True</property>