From ad7272601fd682f4d902003f3c041417ee9b1e01 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, 13 Apr 2023 10:54:14 +0800 Subject: Start relying on Bootstrap.mode instead of Eduport's --- Header.ui.qml | 18 ++++++++++-------- Home/Default.ui.qml | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Header.ui.qml b/Header.ui.qml index ccdff46..4799d8e 100644 --- a/Header.ui.qml +++ b/Header.ui.qml @@ -32,7 +32,7 @@ ToolBar { horizontalPadding: 15 background: Rectangle { implicitHeight: 70 - color: Eduport.bsBodyBg + color: window.Bootstrap.bodyBg } ToolButton { @@ -61,9 +61,9 @@ ToolBar { id: rectangle anchors.fill: parent radius: 5.2 - color: Eduport.mode + color: window.Bootstrap.mode ? Eduport.bsDark - : Eduport.bsBodyBg + : Bootstrap.bodyBg } DrpShdw.Box { @@ -80,8 +80,9 @@ ToolBar { contentItem: Rectangle { implicitWidth: width implicitHeight: 1 - color: Eduport.mode - ? Eduport.bsGray300 : Eduport.bsGray500 + color: window.Bootstrap.mode + ? Eduport.bsGray300 + : Eduport.bsGray500 } } } @@ -280,7 +281,8 @@ ToolBar { ? Eduport.bsDropdownLinkHoverBg : Eduport.mode ? Eduport.bsDark - : Eduport.bsBodyBg + : window + .Bootstrap.bodyBg radius: 5.2 } } @@ -396,7 +398,7 @@ ToolBar { height: 16 } text: qsTr("Light") - checked: Eduport.mode + checked: Bootstrap.mode == Bootstrap .Mode .Light @@ -412,7 +414,7 @@ ToolBar { height: 16 } text: qsTr("Dark") - checked: Eduport.mode + checked: Bootstrap.mode == Bootstrap .Mode .Dark diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml index e47b074..bf2d2c6 100644 --- a/Home/Default.ui.qml +++ b/Home/Default.ui.qml @@ -21,7 +21,7 @@ Flickable { Rectangle { anchors.fill: parent - color: Eduport.bsBodyBg + color: window.Bootstrap.bodyBg } ColumnLayout { -- cgit v1.2.3