From fc100ff4832d4e8e8765201176eb0d5c4fedea97 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: Sun, 2 Apr 2023 13:45:16 +0800 Subject: Fix most of remaining checkout colours --- Shop/Checkout.ui.qml | 1 + Shop/Checkout/RightSidebar/OrderSummary.ui.qml | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Shop/Checkout.ui.qml b/Shop/Checkout.ui.qml index aaef97c..84e225c 100644 --- a/Shop/Checkout.ui.qml +++ b/Shop/Checkout.ui.qml @@ -83,6 +83,7 @@ Flickable { implicitHeight: orderSummary.height Layout.margins: 16 radius: 8 + color: Eduport.bsCardBg OrderSummary { id: orderSummary diff --git a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml index 9d59d8b..7564106 100644 --- a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml +++ b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml @@ -31,19 +31,20 @@ ColumnLayout { implicitHeight: codeLabel.implicitHeight + codeValue.implicitHeight - Label { + Body { id: codeLabel text: qsTr("Transaction code") - font.pointSize: 14 - font.family: "roboto" anchors.verticalCenter: parent.verticalCenter } - Label { + H6 { id: codeValue text: "AB12365E" - font.pointSize: 14 - font.family: "roboto" + font { + family: Eduport.fwLightFont.family + weight: Eduport.fwLightFont.weight + pointSize: Eduport.h6FontSize + } anchors { right: parent.right verticalCenter: parent.verticalCenter @@ -138,9 +139,9 @@ ColumnLayout { Item { Layout.fillWidth: true implicitHeight: priceLabel.implicitHeight - + priceValue.implicitHeight + + priceValue.implicitHeight - Label { + H6 { id: priceLabel text: qsTr("Original Price") font { @@ -166,7 +167,7 @@ ColumnLayout { implicitHeight: discountLabel.implicitHeight + discountValue.implicitHeight - Label { + H6 { id: discountLabel text: qsTr("Coupon Discount") font { -- cgit v1.2.3