[gnome-bluetooth] lib: Update UI for updated gnome-control-center UI

[Bastien Nocera <hadess src gnome org>]

commit 04ea1b14e9da1afb8efbeb371a229d44c5c231fa
Author: Allan Day <allanpday gmail com>
Date:   Tue Aug 22 13:39:16 2017 +0100

    lib: Update UI for updated gnome-control-center UI
    
    gnome-control-center panels are being given standardized layouts,
    in order to provide a more seamless experience. This applies the
    same layout rules to the Bluetooth Settings.
    
    Apply a standard vertical spacing of 32px above and below
    content and 12px below headings. Also aim for a standard row
    height of 58px with the normal text size.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=786611

 lib/bluetooth-settings-row.ui   |    4 ++--
 lib/bluetooth-settings-widget.c |    7 +++----
 lib/settings.ui                 |    4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/lib/bluetooth-settings-row.ui b/lib/bluetooth-settings-row.ui
index d9bdd82..9222f65 100644
--- a/lib/bluetooth-settings-row.ui
+++ b/lib/bluetooth-settings-row.ui
@@ -11,8 +11,8 @@
         <property name="can_focus">False</property>
         <property name="margin_start">20</property>
         <property name="margin_end">20</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
+        <property name="margin_top">16</property>
+        <property name="margin_bottom">16</property>
         <child>
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c
index 0d805be..f4b5897 100644
--- a/lib/bluetooth-settings-widget.c
+++ b/lib/bluetooth-settings-widget.c
@@ -1520,7 +1520,7 @@ add_device_section (BluetoothSettingsWidget *self)
        gtk_box_pack_start (GTK_BOX (vbox), box, TRUE, TRUE, 0);
        priv->child_box = box;
 
-       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
        gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, TRUE, 0);
 
        s = g_markup_printf_escaped ("<b>%s</b>", _("Devices"));
@@ -1528,9 +1528,8 @@ add_device_section (BluetoothSettingsWidget *self)
        g_free (s);
        gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
        gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-       gtk_widget_set_margin_start (widget, 6);
        gtk_widget_set_margin_end (widget, 6);
-       gtk_widget_set_margin_bottom (widget, 6);
+       gtk_widget_set_margin_bottom (widget, 12);
        gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
 
        /* Discoverable spinner */
@@ -1538,7 +1537,7 @@ add_device_section (BluetoothSettingsWidget *self)
        g_object_bind_property (G_OBJECT (priv->client), "default-adapter-discovering",
                                G_OBJECT (priv->device_spinner), "active",
                                G_BINDING_SYNC_CREATE);
-       gtk_widget_set_margin_bottom (spinner, 6);
+       gtk_widget_set_margin_bottom (spinner, 12);
        gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, TRUE, 0);
 
        /* Discoverable label placeholder, the real name is set in update_visibility().
diff --git a/lib/settings.ui b/lib/settings.ui
index f46cd3f..470f2ed 100644
--- a/lib/settings.ui
+++ b/lib/settings.ui
@@ -383,8 +383,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
-                <property name="margin_top">16</property>
-                <property name="margin_bottom">8</property>
+                <property name="margin_top">32</property>
+                <property name="margin_bottom">12</property>
                 <property name="label">Visible as “Bastien's computer” and available for Bluetooth file 
transfers. Transferred files are placed in the &lt;a href="http://www.gnome.org"&gt;Downloads&lt;/a&gt; 
folder.</property>
                 <property name="use_markup">True</property>
                 <property name="justify">fill</property>