From bef7779988f8fc0ebd3197aa750d5e71516b524b 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, 28 Mar 2023 20:33:02 +0800 Subject: Set profile full name & email colours --- Header.ui.qml | 2 ++ Label/H6.ui.qml | 3 ++- imports/Eduport/Eduport.qml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Header.ui.qml b/Header.ui.qml index b722078..0a9d80e 100644 --- a/Header.ui.qml +++ b/Header.ui.qml @@ -192,6 +192,8 @@ ToolBar { text: emailText font.pointSize: 14 + color: Eduport + .bsDropdownColor } } } diff --git a/Label/H6.ui.qml b/Label/H6.ui.qml index ed008c5..b9b16a0 100644 --- a/Label/H6.ui.qml +++ b/Label/H6.ui.qml @@ -3,10 +3,11 @@ import QtQuick.Controls 2.15 import Eduport 1.4 Label { - wrapMode: Label.Wrap font { family: Eduport.hxFont.family weight: Eduport.hxFont.weight pointSize: Eduport.h6FontSize } + color: Eduport.bsHeadingColor + wrapMode: Label.Wrap } diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index ab9957c..315addd 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -87,9 +87,13 @@ QtObject { readonly property color bsBtnSuccessDisabledBorderColor: bsBtnSuccessDisabledBg + property color bsDropdownColor: "#747579" property color bsDropdownLinkColor: mode == Eduport.Mode.Light ? "#747579" : "#c5c6cc" + property color bsHeadingColor: mode == Eduport.Mode.Light + ? "#24292d" : "#ffffff" + property color bsGray300: mode == Eduport.Mode.Light ? "#dde0e3" : "#3e3e40" property color bsGray500: mode == Eduport.Mode.Light -- cgit v1.2.3