[geary/gnome-3-32] Merge branch 'wip/299-squished-switches' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 841df5d0c79e52f4a1061226a28ebc1a397eb4f0
Author: Michael Gratton <mike vee net>
Date:   Sat Mar 30 05:18:11 2019 +0000

    Merge branch 'wip/299-squished-switches' into 'master'
    
    Fix switches in the accounts editor looking squashed
    
    Closes #299
    
    See merge request GNOME/geary!187
    
    (cherry picked from commit 38899fa2494b0a4dfbf30b47184370f40ef02720)
    
    8f04e4cc Fix switches in the accounts editor looking squashed

 ui/geary.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ui/geary.css b/ui/geary.css
index a11f940f..b1bd0031 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -218,10 +218,6 @@ row.geary-settings {
   padding: 0px;
 }
 
-row.geary-settings image {
-  padding: 0px 6px;
-}
-
 row.geary-settings entry {
   border-width: 0px;
   background-color: transparent;
@@ -271,6 +267,14 @@ frame.geary-settings.geary-signature {
   min-height: 5em;
 }
 
+/* Images should have some padding to offset them from adjacent
+widgets, but care ust be taken since images are also used as children
+of other widgets like entries, comboboxes and switches, and these
+shouldn't be be touched. */
+row.geary-settings widget > image,
+row.geary-settings grid > image {
+  padding: 0px 6px;
+}
 
 row.geary-settings > grid > combobox,
 row.geary-settings > grid > entry,