[california/wip/733760-caldav] Clean up Google activator deck

[Jim Nelson <jnelson src gnome org>]

commit 5f929b7d1800fad4f626f2e8c2ad12adb0b5d7eb
Author: Jim Nelson <jim yorba org>
Date:   Thu Aug 7 16:01:52 2014 -0700

    Clean up Google activator deck

 src/rc/google-calendar-list.ui |    6 +++---
 src/rc/google-login.ui         |   17 +++++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/src/rc/google-calendar-list.ui b/src/rc/google-calendar-list.ui
index a5ca801..c60bae3 100644
--- a/src/rc/google-calendar-list.ui
+++ b/src/rc/google-calendar-list.ui
@@ -5,13 +5,13 @@
   <template class="CaliforniaActivatorGoogleCalendarListPane" parent="GtkGrid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="row_spacing">8</property>
+    <property name="row_spacing">4</property>
     <child>
       <object class="GtkLabel" id="my_calendars_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">My calendars:</property>
+        <property name="label" translatable="yes">My calendars</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -113,7 +113,7 @@
         <property name="can_focus">False</property>
         <property name="margin_top">8</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Other available calendars:</property>
+        <property name="label" translatable="yes">Other available calendars</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/src/rc/google-login.ui b/src/rc/google-login.ui
index 3740c75..1675e4e 100644
--- a/src/rc/google-login.ui
+++ b/src/rc/google-login.ui
@@ -6,6 +6,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="row_spacing">8</property>
+    <property name="column_spacing">8</property>
     <child>
       <object class="GtkButtonBox" id="buttonbox">
         <property name="visible">True</property>
@@ -64,11 +65,14 @@
       <object class="GtkLabel" id="account_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">end</property>
         <property name="xalign">1</property>
-        <property name="xpad">8</property>
-        <property name="label" translatable="yes">Google _account name:</property>
+        <property name="label" translatable="yes">Google _account name</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">account_entry</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -83,6 +87,7 @@
         <property name="can_focus">True</property>
         <property name="has_focus">True</property>
         <property name="is_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="activates_default">True</property>
         <property name="width_chars">24</property>
         <property name="input_purpose">email</property>
@@ -98,11 +103,14 @@
       <object class="GtkLabel" id="password_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">end</property>
         <property name="xalign">1</property>
-        <property name="xpad">8</property>
-        <property name="label" translatable="yes">Google _password:</property>
+        <property name="label" translatable="yes">Google _password</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">password_entry</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -115,6 +123,7 @@
       <object class="GtkEntry" id="password_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="visibility">False</property>
         <property name="activates_default">True</property>
         <property name="width_chars">24</property>