update layout spacing

joelhawksley · May 4, 2024 · 72faa1e · 72faa1e
1 parent 13ef918
commit 72faa1e
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 50 deletions.
diff --git a/app/components/timeline.html.slim b/app/components/timeline.html.slim
@@ -2,7 +2,7 @@
   - next if !event_day[:show_daily_events] && event_day[:events][:periodic].empty?
   div style="display: flex; margin-bottom: 1rem"
     div style="width: 15.5rem; vertical-align: top; padding-right: 1rem; border-right: 2px solid #ccc;"
-      div style="font-size: 2rem; font-weight: 700" = event_day[:day_name]
+      div style="font-size: 2rem; font-weight: 700; line-height: 1" = event_day[:day_name]
       table
         - event_day[:events][:daily].each do |event|
           tr

diff --git a/app/views/displays/mira.html.slim b/app/views/displays/mira.html.slim
@@ -41,14 +41,20 @@ div.hide-if-empty style="font-size: 1.75rem; position:absolute; left: 0; right:
         |  :
         =< status[:track]
 div style="margin-top: 1.5rem;"
-div style="text-align: right; margin-bottom: .5rem;"
-  - if Birdnet.healthy? && Birdnet.most_unusual_species_trailing_24h.present?
-    i.fa-solid.fa-crow
-    =< Birdnet.most_unusual_species_trailing_24h["commonName"]
-  - else
-    | &nbsp;
-div style="display: flex; justify-content: space-between; line-height: 2rem;"
-  div style="font-size: 1.75rem"
+div style="display: flex; justify-content: space-between;"
+  div
+    - HomeAssistantHome.unavailable_door_sensors.each do |door_sensor_name|
+      span style="margin-right: 1rem"
+        i.fa-solid.fa-triangle-exclamation
+        =< door_sensor_name
+  div style="text-align: right; margin-bottom: .5rem;"
+    - if Birdnet.healthy? && Birdnet.most_unusual_species_trailing_24h.present?
+      i.fa-solid.fa-crow
+      =< Birdnet.most_unusual_species_trailing_24h["commonName"]
+    - else
+      | &nbsp;
+div style="display: flex; justify-content: space-between; line-height: 2rem; font-size:2rem;"
+  div
     - if HomeAssistantHome.package_present?
       i.fa-solid.fa-box-open style="margin-right: 1rem"
     - if HomeAssistantHome.garage_door_open?
@@ -75,10 +81,6 @@ div style="display: flex; justify-content: space-between; line-height: 2rem;"
       i.fa-solid.fa-car-side-bolt style="margin-right: 1rem"
     - if !DogPark.open?
       i.fa-solid.fa-location-pin-lock style="margin-right: 1rem"
-    - HomeAssistantHome.unavailable_door_sensors.each do |door_sensor_name|
-      span style="margin-right: 1rem"
-        i.fa-solid.fa-triangle-exclamation
-        =< door_sensor_name
     - HomeAssistantHome.unlocked_doors.each do |door_name|
       span style="margin-right: 1rem"
         i.fa-solid.fa-lock-open
@@ -87,7 +89,7 @@ div style="display: flex; justify-content: space-between; line-height: 2rem;"
       span style="margin-right: 1rem"
         i.fa-solid.fa-door-open
         =< door_name
-  div style="font-size:2rem;" = DateTime.now.strftime("%A, %B %-d")
+  div = DateTime.now.strftime("%A, %B %-d")
 div style="margin-top: 1rem; display: flex; justify-content: space-between; line-height: .7"
   div style="font-size: 5.5rem; margin-bottom: 1rem;"
     = view_object[:current_temperature]

diff --git a/app/views/displays/thirteen.html.slim b/app/views/displays/thirteen.html.slim
@@ -1,42 +1,46 @@
 .timestamp style="position: absolute; bottom: .25rem; right: .25rem; font-size: .4rem; color: #777; z-index: 10" = view_object[:timestamp]
-div style="font-size: 1rem"
-  - if !WeatherKitAccount.healthy?
-    i.fa-solid.fa-cloud-slash style="margin-right: 1rem; margin-bottom: 1rem;"
-  - if !GoogleAccount.all.all?(&:healthy?)
-    i.fa-solid.fa-calendar-circle-exclamation style="margin-right: 1rem; margin-bottom: 1rem;"
-  - if !HomeAssistantHome.healthy?
-    i.fa-solid.fa-house-circle-exclamation style="margin-right: 1rem; margin-bottom: 1rem;"
-  - if !HomeAssistantHome.hot_water_heater_healthy?
-    i.fa-solid.fa-tank-water style="margin-right: 1rem; margin-bottom: 1rem"
-  - if HomeAssistantHome.washer_needs_attention?
-    i.fa-solid.fa-washing-machine style="margin-right: 1rem; margin-bottom: 1rem"
-  - if HomeAssistantHome.dryer_needs_attention?
-    i.fa-solid.fa-dryer-heat style="margin-right: 1rem; margin-bottom: 1rem"
-  - if HomeAssistantHome.car_needs_plugged_in?
-    i.fa-solid.fa-car-side-bolt style="margin-right: 1rem; margin-bottom: 1rem"
-  - if !DogPark.open?
-    i.fa-solid.fa-location-pin-lock style="margin-right: 1rem; margin-bottom: 1rem"
-  - HomeAssistantHome.unavailable_door_sensors.each do |door_sensor_name|
-    span style="margin-right: 1rem; margin-bottom: 1rem"
-      i.fa-solid.fa-triangle-exclamation
-      =< door_sensor_name
-  - HomeAssistantHome.unlocked_doors.each do |door_name|
-    span style="margin-right: 1rem; margin-bottom: 1rem"
-      i.fa-solid.fa-lock-open
-      =< door_name
-  - HomeAssistantHome.open_doors.each do |door_name|
-    span style="margin-right: 1rem; margin-bottom: 1rem"
-      i.fa-solid.fa-door-open
-      =< door_name
-  - if Birdnet.healthy? && Birdnet.most_unusual_species_trailing_24h.present?
-    div style="display: inline-block; margin-bottom: 1rem; margin-right: 1rem"
-      i.fa-solid.fa-crow
-      =< Birdnet.most_unusual_species_trailing_24h["commonName"]
-div style="clear: both; line-height: .7; margin-bottom: 1rem; padding-bottom: 1rem;"
-  div style="float: left; font-size: 2rem;"
+div style="clear: both; line-height: .7; margin-bottom: 1rem; font-size: 1rem"
+  div style="float: left;"
+    - if !WeatherKitAccount.healthy?
+      i.fa-solid.fa-cloud-slash style="margin-right: 1rem;"
+    - if !GoogleAccount.all.all?(&:healthy?)
+      i.fa-solid.fa-calendar-circle-exclamation style="margin-right: 1rem;"
+    - if !HomeAssistantHome.healthy?
+      i.fa-solid.fa-house-circle-exclamation style="margin-right: 1rem;"
+    - if !HomeAssistantHome.hot_water_heater_healthy?
+      i.fa-solid.fa-tank-water style="margin-right: 1rem;"
+    - if HomeAssistantHome.washer_needs_attention?
+      i.fa-solid.fa-washing-machine style="margin-right: 1rem;"
+    - if HomeAssistantHome.dryer_needs_attention?
+      i.fa-solid.fa-dryer-heat style="margin-right: 1rem;"
+    - if HomeAssistantHome.car_needs_plugged_in?
+      i.fa-solid.fa-car-side-bolt style="margin-right: 1rem;"
+    - if !DogPark.open?
+      i.fa-solid.fa-location-pin-lock style="margin-right: 1rem;"
+    - HomeAssistantHome.unavailable_door_sensors.each do |door_sensor_name|
+      span style="margin-right: 1rem;"
+        i.fa-solid.fa-triangle-exclamation
+        =< door_sensor_name
+    - HomeAssistantHome.unlocked_doors.each do |door_name|
+      span style="margin-right: 1rem;"
+        i.fa-solid.fa-lock-open
+        =< door_name
+    - HomeAssistantHome.open_doors.each do |door_name|
+      span style="margin-right: 1rem;"
+        i.fa-solid.fa-door-open
+        =< door_name
+  div style="float: right; text-align: right;"
+    - if Birdnet.healthy? && Birdnet.most_unusual_species_trailing_24h.present?
+      div style="display: inline-block;"
+        i.fa-solid.fa-crow
+        =< Birdnet.most_unusual_species_trailing_24h["commonName"]
+  div
+    | &nbsp;
+div style="clear: both; line-height: .7; margin-bottom: 1rem; padding-bottom: .5rem; font-size: 3rem;"
+  div style="float: left;"
     = view_object[:current_temperature]
     ' °
-  div style="float: right; text-align: right; font-size: 2rem;" = DateTime.now.strftime("%A, %B %-d")
+  div style="float: right; text-align: right;" = DateTime.now.strftime("%A, %B %-d")
   div
     | &nbsp;
 hr style="margin: 1rem 0 1rem; border: none; background-color: #ccc; color: #ccc; height: 2px;"