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 --- Course/Detail/Classic/Content/Main.ui.qml | 1 - Course/Detail/Classic/Content/Sidebar.ui.qml | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'Course/Detail') diff --git a/Course/Detail/Classic/Content/Main.ui.qml b/Course/Detail/Classic/Content/Main.ui.qml index 91cbce3..25d6c9a 100644 --- a/Course/Detail/Classic/Content/Main.ui.qml +++ b/Course/Detail/Classic/Content/Main.ui.qml @@ -2,7 +2,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 -import Bootstrap 5.3 import "../../../../Label" as Lbl import "../../../../Button/NavLink" as NavLink import "Main/TabContents" as MainTabContents diff --git a/Course/Detail/Classic/Content/Sidebar.ui.qml b/Course/Detail/Classic/Content/Sidebar.ui.qml index 01ab830..919524c 100644 --- a/Course/Detail/Classic/Content/Sidebar.ui.qml +++ b/Course/Detail/Classic/Content/Sidebar.ui.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 import QtMultimedia 5.15 -import Bootstrap 5.3 +import Eduport 1.4 import "../../../../Label" as Lbl import "../../../../Button" as Btn @@ -133,9 +133,9 @@ ColumnLayout { text: qsTr("60% off") color: "white" font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.badgeFontSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bsBadgeFontSize } horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -168,7 +168,7 @@ ColumnLayout { horizontalPadding: 16 verticalPadding: 8 text: qsTr("Free trial") - font: Bootstrap.btnFont + font: Eduport.bsBtnFont contentItem: Text { horizontalAlignment : Text -- cgit v1.2.3