[gnome-todo] window: Unify headebars

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 06faf75dca94d03379ca011be46ee86958945966
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sun Apr 26 23:22:21 2020 -0300

    window: Unify headebars
    
    https://gitlab.gnome.org/GNOME/gnome-todo/-/issues/324

 src/gtd-window.ui     | 33 +++++++++------------------------
 src/theme/Adwaita.css | 11 -----------
 2 files changed, 9 insertions(+), 35 deletions(-)
---
diff --git a/src/gtd-window.ui b/src/gtd-window.ui
index 89d1da2..1b2bed3 100644
--- a/src/gtd-window.ui
+++ b/src/gtd-window.ui
@@ -44,7 +44,9 @@
     <child type="titlebar">
       <object class="GtkBox">
         <child>
-          <object class="GtkHeaderBar" id="start_headerbar">
+          <object class="GtkHeaderBar" id="headerbar">
+            <property name="hexpand">1</property>
+            <property name="show-title-buttons">1</property>
             <child>
               <object class="GtkMenuButton" id="new_list_button">
                 <property name="can_focus">1</property>
@@ -64,23 +66,6 @@
                 <property name="icon-name">go-previous-symbolic</property>
               </object>
             </child>
-            <child type="end">
-              <object class="GtkMenuButton">
-                <property name="menu-model">app-menu</property>
-                <property name="direction">none</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="orientation">vertical</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkHeaderBar" id="headerbar">
-            <property name="hexpand">1</property>
-            <property name="show-title-buttons">1</property>
             <child>
               <object class="GtkBox" id="panel_box_start">
                 <property name="spacing">6</property>
@@ -101,6 +86,12 @@
                 <signal name="clicked" handler="on_cancel_selection_button_clicked" object="GtdWindow" 
swapped="no"/>
               </object>
             </child>
+            <child type="end">
+              <object class="GtkMenuButton">
+                <property name="menu-model">app-menu</property>
+                <property name="direction">none</property>
+              </object>
+            </child>
             <child type="end">
               <object class="GtkMenuButton" id="gear_menu_button">
                 <property name="can_focus">1</property>
@@ -126,12 +117,6 @@
     <property name="can_focus">False</property>
     <property name="position">bottom</property>
   </object>
-  <object class="GtkSizeGroup">
-    <widgets>
-      <widget name="sidebar"/>
-      <widget name="start_headerbar"/>
-    </widgets>
-  </object>
   <object class="GtkSizeGroup">
     <widgets>
       <widget name="stack"/>
diff --git a/src/theme/Adwaita.css b/src/theme/Adwaita.css
index 4c66502..e2bd944 100644
--- a/src/theme/Adwaita.css
+++ b/src/theme/Adwaita.css
@@ -128,17 +128,6 @@ image.color-circle-icon {
     -gtk-icon-shadow: 0 1px alpha(black, 0.18);
 }
 
-/*
- * Hack: Move separator by 1px so that it aligns with the sidebar
- *
- * Stolen from https://gitlab.gnome.org/GNOME/polari/blob/master/data/resources/application.css
- */
-.titlebar > separator:dir(ltr) { margin-left: -1px; }
-.titlebar > headerbar:first-child:dir(ltr) { margin-right: 1px; }
-.titlebar > separator:dir(rtl) { margin-right: -1px; }
-.titlebar > headerbar:first-child:dir(rtl) { margin-left: 1px; }
-
-
 /* Color button */
 colorbutton {
     border-radius: 6px;