From d35cc3dda4dc08dd16d9d12d5f96863d831fd6c7 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 28 Mar 2020 19:12:00 +0100 Subject: Use palette for qml code for theming Can't do it for QtWidgets code. We need to fully transition, before we can fully switch over probably. --- resources/styles/nheko-dark.qss | 1 + resources/styles/nheko.qss | 1 + resources/styles/system.qss | 14 +++++++------- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'resources/styles') diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss index c0d91f99..b0b3f96d 100644 --- a/resources/styles/nheko-dark.qss +++ b/resources/styles/nheko-dark.qss @@ -32,6 +32,7 @@ UserMentionsWidget > * { QLineEdit, QListWidget, +QToolTip, WelcomePage, LoginPage, RegisterPage, diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss index 960809de..d5d98ed4 100644 --- a/resources/styles/nheko.qss +++ b/resources/styles/nheko.qss @@ -183,6 +183,7 @@ TopSection { WelcomePage, LoginPage, +QToolTip, RegisterPage { background-color: white; color: #333; diff --git a/resources/styles/system.qss b/resources/styles/system.qss index 3ae3147a..dd2a90ef 100644 --- a/resources/styles/system.qss +++ b/resources/styles/system.qss @@ -70,7 +70,7 @@ FileItem { } RaisedButton { - qproperty-foregroundColor: palette(buttonText); + qproperty-foregroundColor: palette(button-text); } TextField { @@ -95,18 +95,18 @@ UserMentionsWidget { qproperty-titleColor: palette(text); qproperty-subtitleColor: palette(text); - qproperty-highlightedTitleColor: palette(highlightedtext); - qproperty-highlightedSubtitleColor: palette(highlightedtext); + qproperty-highlightedTitleColor: palette(highlighted-text); + qproperty-highlightedSubtitleColor: palette(highlighted-text); qproperty-hoverTitleColor: palette(highlightedtext); qproperty-hoverSubtitleColor: palette(highlightedtext); - qproperty-btnColor: palette(button); - qproperty-btnTextColor: palette(buttonText); + qproperty-btnColor: palette(dark); + qproperty-btnTextColor: palette(bright-text); qproperty-timestampColor: palette(text); - qproperty-highlightedTimestampColor: palette(highlightedtext); - qproperty-hoverTimestampColor: palette(highlightedtext); + qproperty-highlightedTimestampColor: palette(highlighted-text); + qproperty-hoverTimestampColor: palette(highlighted-text); qproperty-bubbleBgColor: palette(base); qproperty-bubbleFgColor: palette(text); -- cgit 1.4.1