Просмотр исходного кода

Fix font size for the titles in the welcome flow

CURA-6057
Jaime van Kessel 6 лет назад
Родитель
Сommit
7a3cd81e3f

+ 1 - 1
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml

@@ -23,7 +23,7 @@ Item
         horizontalAlignment: Text.AlignHCenter
         text: catalog.i18nc("@label", "Add a printer")
         color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
+        font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering
     }
 

+ 3 - 6
resources/qml/WelcomePages/AddPrinterByIpContent.qml

@@ -29,12 +29,11 @@ Item
     {
         id: titleLabel
         anchors.top: parent.top
-        anchors.topMargin: UM.Theme.getSize("wide_margin").height
         anchors.horizontalCenter: parent.horizontalCenter
         horizontalAlignment: Text.AlignHCenter
         text: catalog.i18nc("@label", "Add printer by IP address")
         color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
+        font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering
     }
 
@@ -44,8 +43,8 @@ Item
         anchors.bottom: connectButton.top
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         anchors.bottomMargin: UM.Theme.getSize("default_margin").height
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: Math.floor(parent.width * 3 / 4)
+        anchors.left: parent.left
+        anchors.right: parent.right
 
         Item
         {
@@ -241,7 +240,6 @@ Item
         id: backButton
         anchors.left: parent.left
         anchors.bottom: parent.bottom
-        anchors.margins: UM.Theme.getSize("wide_margin").width
         text: catalog.i18nc("@button", "Cancel")
         onClicked: base.showPreviousPage()
     }
@@ -251,7 +249,6 @@ Item
         id: connectButton
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        anchors.margins: UM.Theme.getSize("wide_margin").width
         text: catalog.i18nc("@button", "Connect")
         onClicked:
         {

+ 1 - 1
resources/qml/WelcomePages/DataCollectionsContent.qml

@@ -23,7 +23,7 @@ Item
         horizontalAlignment: Text.AlignHCenter
         text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura")
         color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
+        font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering
     }
 

+ 1 - 1
resources/qml/WelcomePages/FirstStartMachineActionsContent.qml

@@ -44,7 +44,7 @@ Item
         horizontalAlignment: Text.AlignHCenter
         text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title
         color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
+        font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering
     }
 

+ 1 - 1
resources/qml/WelcomePages/UserAgreementContent.qml

@@ -22,7 +22,7 @@ Item
         horizontalAlignment: Text.AlignHCenter
         text: catalog.i18nc("@label", "User Agreement")
         color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
+        font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering
     }
 

+ 1 - 1
resources/qml/WelcomePages/WelcomeContent.qml

@@ -28,7 +28,7 @@ Item
             horizontalAlignment: Text.AlignHCenter
             text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
             color: UM.Theme.getColor("primary_button")
-            font: UM.Theme.getFont("large_bold")
+            font: UM.Theme.getFont("huge")
             renderType: Text.NativeRendering
         }
 

+ 1 - 1
resources/qml/WelcomePages/WhatsNewContent.qml

@@ -23,7 +23,7 @@ Item
         horizontalAlignment: Text.AlignHCenter
         text: catalog.i18nc("@label", "What's new in Ultimaker Cura")
         color: UM.Theme.getColor("primary_button")
-        font: UM.Theme.getFont("large_bold")
+        font: UM.Theme.getFont("huge")
         renderType: Text.NativeRendering
     }
 

+ 5 - 0
resources/themes/cura-light/theme.json

@@ -29,6 +29,11 @@
             "weight": 63,
             "family": "Noto Sans"
         },
+        "huge": {
+            "size": 1.8,
+            "weight": 50,
+            "family": "Noto Sans"
+        },
         "medium": {
             "size": 1.16,
             "weight": 40,