From db0a295904cf54c03023a9f64b458cdcddf363c3 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 17:33:20 +0800 Subject: Reorganise auth, primary button, and reuse --- imports/Bootstrap/Bootstrap.qml | 10 ++++++++-- imports/Eduport/Eduport.qml | 15 +++++++++++++++ imports/Eduport/qmldir | 2 ++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 imports/Eduport/Eduport.qml create mode 100644 imports/Eduport/qmldir (limited to 'imports') diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml index 321eedf..3afa941 100644 --- a/imports/Bootstrap/Bootstrap.qml +++ b/imports/Bootstrap/Bootstrap.qml @@ -1,5 +1,4 @@ pragma Singleton - import QtQuick 2.15 QtObject { @@ -16,9 +15,16 @@ QtObject { readonly property FontLoader medium: FontLoader { source: haveRoboto ? "" : "../../Roboto/Roboto-Medium.ttf" } + readonly property FontLoader regular: FontLoader { + source: haveRoboto ? "" : "../../Roboto/Roboto-Regular.ttf" + } + readonly property font bodyFont: Qt.font({ + family: haveRoboto ? "Roboto" : regular.name, + pointSize: 15 + }) readonly property font btnFont: Qt.font({ - pointSize: 15, family: haveRoboto ? "Roboto" : medium.name, + pointSize: 15, weight: Font.Medium }) } diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml new file mode 100644 index 0000000..b966920 --- /dev/null +++ b/imports/Eduport/Eduport.qml @@ -0,0 +1,15 @@ +pragma Singleton +import QtQuick 2.15 + +QtObject { + readonly property real fontSizeLead: 18.75 + readonly property real fontSizeFormControl: 16 + readonly property real fontSizeFormText: 14 + + readonly property FontLoader heebo: FontLoader { + source: "../../Heebo/Heebo-Bold.ttf" + } + readonly property font hFont: Qt.font({ + family: heebo.name + }) +} diff --git a/imports/Eduport/qmldir b/imports/Eduport/qmldir new file mode 100644 index 0000000..4318031 --- /dev/null +++ b/imports/Eduport/qmldir @@ -0,0 +1,2 @@ +module Eduport +singleton Eduport 1.0 Eduport.qml -- cgit v1.2.3