From c683137864917a64cb0632007ea59dcb478622bc 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 21:40:05 +0800 Subject: Move card to default home folder --- imports/Bootstrap/Bootstrap.qml | 7 +++++-- imports/Eduport/Eduport.qml | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'imports') diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml index 3afa941..a7a2951 100644 --- a/imports/Bootstrap/Bootstrap.qml +++ b/imports/Bootstrap/Bootstrap.qml @@ -2,6 +2,8 @@ pragma Singleton import QtQuick 2.15 QtObject { + readonly property real badgeFontSize: 13.6 + readonly property color btnColor: "#ffffff" readonly property color btnBg: "#066ac9" readonly property color btnActiveBg: "#0555a1" @@ -20,11 +22,12 @@ QtObject { } readonly property font bodyFont: Qt.font({ family: haveRoboto ? "Roboto" : regular.name, + weight: Font.Normal, pointSize: 15 }) readonly property font btnFont: Qt.font({ family: haveRoboto ? "Roboto" : medium.name, - pointSize: 15, - weight: Font.Medium + weight: Font.Medium, + pointSize: 15 }) } diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index 106b1ab..e3b36dd 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -13,6 +13,9 @@ QtObject { readonly property FontLoader medium: FontLoader { source: "../../Heebo/Heebo-Medium.ttf" } + readonly property FontLoader regular: FontLoader { + source: "../../Heebo/Heebo-Regular.ttf" + } readonly property font hFont: Qt.font({ family: bold.name, weight: Font.Bold @@ -21,4 +24,8 @@ QtObject { family: medium.name, weight: Font.Medium }) + readonly property font fwLightFont: Qt.font({ + family: regular.name, + weight: Font.Normal + }) } -- cgit v1.2.3