[gnome-clocks/zbrown/homogenize-lists: 3/3] general: homogenize list styling

[Zander <zbrown src gnome org>]

commit 34a7bdb03996069d7b0239b68c75e952b2f4d68c
Author: Zander Brown <zbrown gnome org>
Date:   Sun Feb 23 19:27:55 2020 +0000

    general: homogenize list styling

 data/css/gnome-clocks.css | 17 ++++++++++-------
 data/ui/alarm.ui          |  3 ++-
 data/ui/timer.ui          |  2 +-
 data/ui/timer_row.ui      |  1 +
 data/ui/window.ui         |  2 +-
 data/ui/world.ui          |  5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index 41bea50..06153d0 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -12,6 +12,14 @@ label.destructive-action {
     color: #e01b24;
 }
 
+/* Shared */
+
+.clocks-list {
+    border-radius: 6px;
+    margin: 18px;
+}
+
+
 /* content view */
 
 .tile {
@@ -52,10 +60,6 @@ row.snoozing {
     font-size: 2.5em;
 }
 
-.alarm-list {
-    border-radius: 6px;
-}
-
 .alarm-repeat {
     font-size: 9pt;
 }
@@ -144,11 +148,10 @@ row.snoozing {
     font-weight: bold;
     padding-right: 20px;
 }
+
 /* Timer Panel */
 /* disguise insensitive spinbuttons as normal labels */
-.timer-list {
-    border-radius: 6px;
-}
+
 
 spinbutton.clocks-timer-label,
 spinbutton.clocks-timer-label button,
diff --git a/data/ui/alarm.ui b/data/ui/alarm.ui
index 58032d4..20b97b3 100644
--- a/data/ui/alarm.ui
+++ b/data/ui/alarm.ui
@@ -44,16 +44,17 @@
           <object class="HdyColumn">
             <property name="visible">True</property>
             <property name="maximum-width">600</property>
+            <property name="linear_growth_width">600</property>
             <child>
               <object class="GtkListBox" id="listbox">
                 <property name="visible">True</property>
-                <property name="margin">12</property>
                 <property name="valign">start</property>
                 <property name="selection-mode">none</property>
                 <property name="activate-on-single-click">False</property>
                 <style>
                   <class name="frame"/>
                   <class name="alarm-list"/>
+                  <class name="clocks-list"/>
                 </style>
               </object>
             </child>
diff --git a/data/ui/timer.ui b/data/ui/timer.ui
index 06d2d60..16658bd 100644
--- a/data/ui/timer.ui
+++ b/data/ui/timer.ui
@@ -82,12 +82,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
-                    <property name="margin">18</property>
                     <property name="selection_mode">none</property>
                     <property name="activate_on_single_click">False</property>
                     <style>
                       <class name="frame"/>
                       <class name="timer-list"/>
+                      <class name="clocks-list"/>
                     </style>
                   </object>
                 </child>
diff --git a/data/ui/timer_row.ui b/data/ui/timer_row.ui
index d046156..adb792f 100644
--- a/data/ui/timer_row.ui
+++ b/data/ui/timer_row.ui
@@ -4,6 +4,7 @@
   <requires lib="gtk+" version="3.20"/>
   <template class="ClocksTimerRow" parent="GtkListBoxRow">
     <property name="visible">True</property>
+    <property name="activatable">False</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkBox">
diff --git a/data/ui/window.ui b/data/ui/window.ui
index beb63d1..520981e 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -28,7 +28,7 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="homogeneous">False</property>
+            <property name="homogeneous">True</property>
             <signal name="notify::visible-child" handler="pane_changed" swapped="no"/>
             <child>
               <object class="ClocksWorldFace" id="world">
diff --git a/data/ui/world.ui b/data/ui/world.ui
index 0b6ece6..9933656 100644
--- a/data/ui/world.ui
+++ b/data/ui/world.ui
@@ -50,16 +50,17 @@
           <object class="HdyColumn">
             <property name="visible">True</property>
             <property name="maximum-width">600</property>
+            <property name="linear_growth_width">600</property>
             <child>
               <object class="GtkListBox" id="listbox">
                 <property name="visible">True</property>
-                <property name="margin">12</property>
                 <property name="valign">start</property>
                 <property name="selection-mode">none</property>
                 <signal name="row-activated" handler="item_activated" swapped="no"/>
                 <style>
                   <class name="frame"/>
-                  <class name="clock-list"/>
+                  <class name="world-list"/>
+                  <class name="clocks-list"/>
                 </style>
               </object>
             </child>