resolve merge conflicts

MycroftAI · May 12, 2021 · bb5ab99 · bb5ab99
1 parent d3e4293
commit bb5ab99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/ui/current_1_scalable.qml b/ui/current_1_scalable.qml
@@ -54,10 +54,12 @@ WeatherDelegateScalable {
         }
     }
 
-    Mycroft.AutoFitLabel {
+    Label {
         //  Current temperature in the configured temperature unit
         id: temperature
         font.weight: Font.Bold
+        font.pixelSize: parent.height * 0.65
+        horizontalAlignment: Text.AlignHCenter
         Layout.fillWidth: true
         Layout.preferredHeight: proportionalGridUnit * 40
         rightPadding: -font.pixelSize * 0.1

diff --git a/ui/current_2_scalable.qml b/ui/current_2_scalable.qml
@@ -31,23 +31,27 @@ import org.kde.lottie 1.0
 WeatherDelegateScalable {
     id: root
 
-    Mycroft.AutoFitLabel {
+    Label {
         id: highTemperature
         font.weight: Font.Bold
+        font.pixelSize: parent.height * 0.50
+        horizontalAlignment: Text.AlignHCenter
         Layout.fillWidth: true
         Layout.preferredHeight: proportionalGridUnit * 40
         //The off-centering to balance the ° should be proportional as well, so we use the computed pixel size
         rightPadding: -font.pixelSize * 0.1
         text: sessionData.highTemperature + "°"
     }
 
-    Mycroft.AutoFitLabel {
+    Label {
         id: lowTemperature
+        font.pixelSize: parent.height * 0.50
+        font.styleName: "Thin"
+        font.weight: Font.Thin
+        horizontalAlignment: Text.AlignHCenter
         Layout.fillWidth: true
         Layout.preferredHeight: proportionalGridUnit * 40
         rightPadding: -font.pixelSize * 0.1
-        font.weight: Font.Thin
-        font.styleName: "Thin"
         text: sessionData.lowTemperature + "°"
     }
 }