[gnome-clocks/wip/vala] Tweaks to the world standalone

[Paolo Borelli <pborelli src gnome org>]

commit 3a11d945d18d678138d78cd1428ff7d18249ea14
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Feb 16 19:24:10 2013 +0100

    Tweaks to the world standalone

 data/css/gnome-clocks.css |    4 ++
 src/widgets.vala          |    1 +
 src/world.ui              |   88 +++++++++++++++++++++++++--------------------
 3 files changed, 54 insertions(+), 39 deletions(-)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index 3121533..a225727 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -55,6 +55,10 @@
                                       );
 }
 
+.clocks-sunrise-sunset {
+    font-size: 18px;
+}
+
 /* alarms */
 
 .clocks-digital-renderer.active {
diff --git a/src/widgets.vala b/src/widgets.vala
index 3e47e95..a68c29f 100644
--- a/src/widgets.vala
+++ b/src/widgets.vala
@@ -52,6 +52,7 @@ public class Toolbar : Gd.MainToolbar {
 
     public Toolbar () {
         Object (show_modes: true, vexpand: false);
+        get_style_context ().add_class (Gtk.STYLE_CLASS_MENUBAR);
     }
 
     public signal void clock_changed (Clock clock);
diff --git a/src/world.ui b/src/world.ui
index e561494..0cc93c4 100644
--- a/src/world.ui
+++ b/src/world.ui
@@ -34,26 +34,17 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">center</property>
-        <property name="margin_bottom">24</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Sunrise</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
+        <property name="valign">center</property>
+        <property name="margin_left">34</property>
+        <property name="margin_right">34</property>
+        <property name="margin_bottom">12</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <child>
-          <object class="GtkLabel" id="label3">
+          <object class="GtkLabel" id="dummy_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Sunset</property>
+            <property name="label" translatable="yes">  </property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -63,27 +54,30 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="sunrise_label">
+          <object class="GtkLabel" id="time_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">label</property>
+            <property name="label" translatable="yes"></property>
+            <style>
+              <class name="clocks-time-label"/>
+            </style>
           </object>
           <packing>
-            <property name="left_attach">1</property>
+            <property name="left_attach">0</property>
             <property name="top_attach">0</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="sunset_label">
+          <object class="GtkLabel" id="day_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes"></property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -91,7 +85,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="top_attach">0</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>
@@ -101,49 +95,65 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">center</property>
-        <property name="valign">center</property>
-        <property name="margin_left">34</property>
-        <property name="margin_bottom">12</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
+        <property name="margin_bottom">24</property>
+        <property name="column_spacing">12</property>
+        <style>
+          <class name="clocks-sunrise-sunset"/>
+        </style>
         <child>
-          <object class="GtkLabel" id="dummy_label">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">  </property>
+            <property name="label" translatable="yes">Sunrise</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">0</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="time_label">
+          <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes"></property>
+            <property name="label" translatable="yes">Sunset</property>
             <style>
-              <class name="clocks-time-label"/>
+              <class name="dim-label"/>
             </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="sunrise_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">label</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
             <property name="top_attach">0</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="day_label">
+          <object class="GtkLabel" id="sunset_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes"></property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -151,7 +161,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="top_attach">1</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>