diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2017-04-27 16:38:22 -0300 |
|---|---|---|
| committer | Debarshi Ray <debarshir@gnome.org> | 2017-05-30 17:06:44 +0200 |
| commit | e63accbf827b2138ae99efcb2e6339321d55dbdb (patch) | |
| tree | 44038da0d2cf475921295c540672ab523944c60a | |
| parent | 00a45b3d70c2016e24edaa442eab36d7b11aa6f3 (diff) | |
| download | gnome-control-center-e63accbf827b2138ae99efcb2e6339321d55dbdb.tar.gz | |
online-accounts: Move the margins and spacing lower down the hierarchy
The expired credentials GtkButton is going to be replaced with a
GtkInfoBar touching the top, start and end edges of the GtkDialog.
Therefore, the margins around the account details and GtkSwitches
cannot be set on the higher level GtkBoxes. Instead, they need to be
set lower down the hierarchy closer to the actual widgets that need
them.
Bump required GOA version for the new goa_provider_show_account
behaviour.
https://bugzilla.gnome.org/show_bug.cgi?id=779368
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | panels/online-accounts/online-accounts.ui | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 5867139c0..6c101e8c2 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ GNOME_DESKTOP_REQUIRED_VERSION=3.21.2 SCHEMAS_REQUIRED_VERSION=3.21.4 LIBWACOM_REQUIRED_VERSION=0.7 CLUTTER_REQUIRED_VERSION=1.11.3 -GOA_REQUIRED_VERSION=3.21.5 +GOA_REQUIRED_VERSION=3.25.3 ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.39 COLORD_REQUIRED_VERSION=0.1.34 COLORD_GTK_REQUIRED_VERSION=0.1.24 diff --git a/panels/online-accounts/online-accounts.ui b/panels/online-accounts/online-accounts.ui index b9a85dc87..c25d37ea2 100644 --- a/panels/online-accounts/online-accounts.ui +++ b/panels/online-accounts/online-accounts.ui @@ -242,7 +242,7 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin">24</property> + <property name="margin-bottom">24</property> <property name="spacing">24</property> <property name="orientation">vertical</property> <child> @@ -251,15 +251,14 @@ <property name="can_focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> - <property name="spacing">18</property> </object> </child> <child> <object class="GtkButton" id="remove_account_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="margin-start">24</property> + <property name="margin-end">24</property> <property name="valign">end</property> <property name="halign">end</property> <property name="label" translatable="yes">Remove Account</property> |