From 1cd3e4c1daa4ad59853fc65c8edddab91f2c0c43 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: Thu, 23 Mar 2023 22:12:42 +0800 Subject: Merge Bootstrap properties to Eduport --- Shop/Checkout.ui.qml | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'Shop/Checkout.ui.qml') diff --git a/Shop/Checkout.ui.qml b/Shop/Checkout.ui.qml index 0409590..c7761c1 100644 --- a/Shop/Checkout.ui.qml +++ b/Shop/Checkout.ui.qml @@ -1,7 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import Bootstrap 5.3 import Eduport 1.4 import "../TextField" as TxtFld import "../Label" as Lbl @@ -57,9 +56,9 @@ Flickable { id: login text: "" + qsTr("Log in") + "" font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.bodyFont.pointSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bodyFont.pointSize underline: false } } @@ -360,9 +359,9 @@ Flickable { contentItem: Text { text: label font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.bodyFont.pointSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bodyFont.pointSize } } } @@ -599,24 +598,24 @@ Flickable { text: qsTr("Place Order") implicitHeight: 36 font { - family: Bootstrap.btnFont.family - weight: Bootstrap.btnFont.weight - pointSize: Bootstrap.btnLgFontSize + family: Eduport.bsBtnFont.family + weight: Eduport.bsBtnFont.weight + pointSize: Eduport.bsBtnLgFontSize } background: Rectangle { - color: placeOrder.down ? Bootstrap.btnSuccessActiveBG + color: placeOrder.down ? Eduport.bsBtnSuccessActiveBG : placeOrder.enabled - ? Bootstrap.btnSuccessBg - : Bootstrap.btnSuccessDisabledBg + ? Eduport.bsBtnSuccessBg + : Eduport.bsBtnSuccessDisabledBg border { - width: Bootstrap.btnBorderWidth + width: Eduport.bsBtnBorderWidth color: placeOrder.down - ? Bootstrap.btnSuccessActiveBorderColor + ? Eduport.bsBtnSuccessActiveBorderColor : placeOrder.enabled - ? Bootstrap.btnSuccessBorderColor - : Bootstrap.btnSuccessDisabledBorderColor + ? Eduport.bsBtnSuccessBorderColor + : Eduport.bsBtnSuccessDisabledBorderColor } - radius: Bootstrap.btnLgBorderRadius + radius: Eduport.bsBtnLgBorderRadius } } } @@ -657,7 +656,7 @@ Flickable { Button { id: premiumButton text: qsTr("Purchase Premium") - font: Bootstrap.btnFont + font: Eduport.bsBtnFont Layout.margins: 16 implicitHeight: 36 contentItem: Text { -- cgit v1.2.3