From da997dc2cef9f552076102a8d7baba346a834fa3 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Sun, 12 Feb 2017 14:05:34 +0100
Subject: user-accounts: Save vertical space in the alignment of widgets

Compensate border-width changes with respective margins.

https://bugzilla.gnome.org/show_bug.cgi?id=778458
---
 panels/user-accounts/data/user-accounts-dialog.ui | 7 +++++--
 panels/user-accounts/um-user-panel.c              | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/panels/user-accounts/data/user-accounts-dialog.ui b/panels/user-accounts/data/user-accounts-dialog.ui
index 0d8114aca..820395a86 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -111,8 +111,9 @@
                 <property name="can_focus">False</property>
                 <property name="column_spacing">10</property>
                 <property name="row_spacing">10</property>
-                <property name="border_width">30</property>
+                <property name="margin_top">20</property>
                 <property name="halign">GTK_ALIGN_CENTER</property>
+                <property name="height_request">300</property>
                 <child>
                   <object class="GtkButton" id="account-fingerprint-button">
                     <property name="visible">True</property>
@@ -422,7 +423,9 @@
                 <property name="can_focus">False</property>
                 <property name="halign">GTK_ALIGN_END</property>
                 <property name="valign">GTK_ALIGN_END</property>
-                <property name="border_width">20</property>
+                <property name="margin_bottom">20</property>
+                <property name="margin_top">20</property>
+                <property name="margin_end">20</property>
                 <property name="label" translatable="yes">Remove User</property>
                 <style>
                   <class name="destructive-action"/>
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index ceea188ef..4d70999a9 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1456,8 +1456,6 @@ cc_user_panel_init (CcUserPanel *self)
         type = um_cell_renderer_user_image_get_type ();
         type = um_carousel_get_type ();
 
-        gtk_widget_set_size_request (GTK_WIDGET (self), -1, 350);
-
         d->builder = gtk_builder_new ();
         d->um = act_user_manager_get_default ();
         d->cancellable = g_cancellable_new ();
-- 
cgit v1.2.1