[gnome-clocks/zbrown/world-clocks] world: new list based design

[Zander <zbrown src gnome org>]

commit a4076aba8b98fb6ee6418bad88b04c80a8aed123
Author: Zander Brown <zbrown gnome org>
Date:   Sun Jan 26 23:29:43 2020 +0000

    world: new list based design
    
    Doesn't yet implement the colour coding
    
    Breaks styling of Alarms but that's going away anyway

 data/css/gnome-clocks.css | 11 +++++++++++
 1 file changed, 11 insertions(+)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index 1cfb799..610c01b 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -66,12 +66,20 @@ row.snoozing {
 
 .clocks-standalone-label,
 .clocks-ringing-label {
+<<<<<<< HEAD
     font-size: 5em;
+=======
+<<<<<<< HEAD
+    font-size: 6em;
+>>>>>>> world: new list based design
 }
 
 .clocks-ringing-title {
     font-size: 1.5em;
     font-weight: bold;
+=======
+    font-size: 5em;
+>>>>>>> world: new list based design
 }
 
 .clocks-secondary-standalone-label {
@@ -268,6 +276,7 @@ spinbutton.clocks-timer-label button {
     background: #e5a50a;
     color: #000000;
     font-weight: lighter;
+<<<<<<< HEAD
     border: 1px solid rgba(0, 0, 0, 0.06);
     transition: 0.4s background ease-in;
 }
@@ -290,5 +299,7 @@ spinbutton.clocks-timer-label button {
 
 .day .clock-time {
   background: #fcf7b0;
+=======
+>>>>>>> world: new list based design
 }