[gnome-maps] sidebar: Remove duplicate border

[Jonas Danielsson <jonasdn src gnome org>]

commit 878eafc155fa07c4e2b8dec4db4049a5bdebadd4
Author: Jonas Danielsson <jonas threetimestwo org>
Date:   Tue Feb 16 13:44:22 2016 +0100

    sidebar: Remove duplicate border
    
    https://bugzilla.gnome.org/show_bug.cgi?id=762132

 data/gnome-maps.css |    5 +++++
 data/ui/sidebar.ui  |   44 ++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/data/gnome-maps.css b/data/gnome-maps.css
index ba2abb3..0f7c8ce 100644
--- a/data/gnome-maps.css
+++ b/data/gnome-maps.css
@@ -57,6 +57,11 @@
     border-right: 1px solid gray;
 }
 
+#instruction-list {
+    border-right: 0px;
+    border-left: 0px;
+}
+
 #instruction-box > GtkImage {
     padding-right: 6px;
     padding-left: 6px;
diff --git a/data/ui/sidebar.ui b/data/ui/sidebar.ui
index 490f3df..77347ed 100644
--- a/data/ui/sidebar.ui
+++ b/data/ui/sidebar.ui
@@ -140,42 +140,38 @@
           </object>
         </child>
         <child>
-          <object class="GtkFrame" id="instruction-frame">
+          <object class="GtkStack" id="instructionStack">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_top">10</property>
-            <property name="shadow_type">in</property>
             <child>
-              <object class="GtkStack" id="instructionStack">
+              <object class="GtkScrolledWindow" id="instructionWindow">
+                <property name="name">instruction-window</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">fill</property>
+                <property name="vexpand">True</property>
+                <property name="margin">1</property>
+                <property name="hscrollbar_policy">never</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="instructionWindow">
-                    <property name="name">instruction-window</property>
+                  <object class="GtkListBox" id="instructionList">
+                    <property name="name">instruction-list</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">fill</property>
-                    <property name="vexpand">True</property>
-                    <property name="margin">1</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <child>
-                      <object class="GtkListBox" id="instructionList">
-                        <property name="name">instruction-list</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">fill</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSpinner" id="instructionSpinner">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="active">True</property>
+                    <style>
+                      <class name="frame"/>
+                    </style>
                   </object>
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkSpinner" id="instructionSpinner">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">True</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>