From 89fcfe5ec1073fd374a8bae3d8457bebd96453c8 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: Wed, 12 Apr 2023 17:30:11 +0800 Subject: BS body font can be set & used instead --- imports/Eduport/Eduport.qml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'imports/Eduport') diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index f5f4da8..be41156 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -6,6 +6,17 @@ QtObject { property int mode: Bootstrap.mode onModeChanged: Bootstrap.mode = mode + property font bodyFont: Qt.font({ + family: Bootstrap.bodyFont.family === "Roboto" + ? (haveRoboto ? "Roboto" : robotoRegular.name) + : Bootstrap.bodyFont.family, + pointSize: Bootstrap.bodyFont.pointSize, + weight: Bootstrap.bodyFont.weight + }) + property color bsBodyColor: Bootstrap.bodyColor + property color bsBodyBg: Bootstrap.bodyBg + property color bsBorderColor: Bootstrap.borderColor + readonly property real leadFontSize: 18.75 readonly property real formControlFontSize: 16 readonly property real h6FontSize: 15 @@ -19,11 +30,6 @@ QtObject { family: haveRoboto ? "Roboto" : robotoBold.name, weight: Font.Bold }) - readonly property font bodyFont: Qt.font({ - family: haveRoboto ? "Roboto" : robotoRegular.name, - weight: Font.Normal, - pointSize: 15 - }) readonly property font hxFont: Qt.font({ family: heeboBold.name, weight: Font.Bold, @@ -42,9 +48,6 @@ QtObject { readonly property real bsBadgeFontSize: 13.6 - property color bsBodyColor: Bootstrap.bodyColor - property color bsBodyBg: Bootstrap.bodyBg - property color bsBorderColor: Bootstrap.borderColor property real bsBorderRadius: 5.2 property real bsBoxShadowOffsetX: 0 -- cgit v1.2.3