[gnome-clocks/zbrown/world-clocks: 35/35] world: fix rebase hickups

[Zander <zbrown src gnome org>]

commit d0f494619e032dacbe6f630c673f5306020a8670
Author: Zander Brown <zbrown gnome org>
Date:   Sun Feb 23 18:16:48 2020 +0000

    world: fix rebase hickups

 data/css/gnome-clocks.css   | 2 +-
 data/ui/alarm.ui            | 2 +-
 data/ui/alarmsetupdialog.ui | 3 ---
 src/alarm.vala              | 8 --------
 4 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index 7cd0201..41bea50 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -75,7 +75,7 @@ row.snoozing {
 }
 
 .clocks-secondary-standalone-label {
-    font-size: 1.7em;
+    font-size: 18pt;
 }
 
 .clocks-button {
diff --git a/data/ui/alarm.ui b/data/ui/alarm.ui
index ec5ff5f..58032d4 100644
--- a/data/ui/alarm.ui
+++ b/data/ui/alarm.ui
@@ -45,7 +45,7 @@
             <property name="visible">True</property>
             <property name="maximum-width">600</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkListBox" id="listbox">
                 <property name="visible">True</property>
                 <property name="margin">12</property>
                 <property name="valign">start</property>
diff --git a/data/ui/alarmsetupdialog.ui b/data/ui/alarmsetupdialog.ui
index 3872acd..7e20c89 100644
--- a/data/ui/alarmsetupdialog.ui
+++ b/data/ui/alarmsetupdialog.ui
@@ -183,9 +183,6 @@
                     </child>
                   </object>
                 </child>
-                <style>
-                  <class name="frame"/>
-                </style>
               </object>
             </child>
           </object>
diff --git a/src/alarm.vala b/src/alarm.vala
index cba75db..c23283e 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -572,9 +572,6 @@ private class SetupDialog : Hdy.Dialog {
         delete_button.visible = alarm != null;
         listbox.set_header_func((Gtk.ListBoxUpdateHeaderFunc) Hdy.list_box_separator_header);
 
-        delete_area.visible = alarm != null;
-        listbox.set_header_func((Gtk.ListBoxUpdateHeaderFunc) Hdy.list_box_separator_header);
-
         other_alarms = new List<Item> ();
         var n = all_alarms.get_n_items ();
         for (int i = 0; i < n; i++) {
@@ -886,11 +883,6 @@ public class Face : Gtk.Stack, Clocks.Clock {
         }
     }
 
-    [GtkCallback]
-    private void create_alarm () {
-        activate_new();
-    }
-
     private void load () {
         alarms.deserialize (settings.get_value ("alarms"), Item.deserialize);
     }