From d8b87b4215aa1d67eb2e7462d66fb21774de82bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Tue, 21 Mar 2023 20:44:50 +0800 Subject: Rename to fwNormal & set counter font weights --- Home/Default/Counter.ui.qml | 7 +++++-- imports/Eduport/Eduport.qml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Home/Default/Counter.ui.qml b/Home/Default/Counter.ui.qml index 587d463..b2b0759 100644 --- a/Home/Default/Counter.ui.qml +++ b/Home/Default/Counter.ui.qml @@ -41,6 +41,7 @@ Item { text: count font { family: Eduport.hFont.family + weight: Eduport.hFont.weight pointSize: 20.1 + .00075 * parent.width } @@ -50,8 +51,10 @@ Item { Label { text: title font { - family: Eduport.normalFont - .family + family: Eduport.fwNormalFont + .family + weight: Eduport.fwNormalFont + .weight pointSize: h6FontSize } Layout.fillWidth: true diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index d2c7831..106b1ab 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -17,7 +17,7 @@ QtObject { family: bold.name, weight: Font.Bold }) - readonly property font normalFont: Qt.font({ + readonly property font fwNormalFont: Qt.font({ family: medium.name, weight: Font.Medium }) -- cgit v1.2.3