ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #658: Drop header color settings from style

Browse Source
This commit is contained in:
Jenkins nymea 2021-08-30 11:53:17 +02:00
commit 3a93236f9c
8 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
androidservice/controlviews/Main.qml
View File

@ -15,7 +15,6 @@ ApplicationWindow {
Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
Material.background: Style.backgroundColor Material.background: Style.backgroundColor
Material.primary: Style.headerBackgroundColor
Material.accent: Style.accentColor Material.accent: Style.accentColor
Material.foreground: Style.foregroundColor Material.foreground: Style.foregroundColor

4
nymea-app/styles/dark/Style.qml
View File

@ -5,9 +5,5 @@ import "../../ui"
StyleBase { StyleBase {
backgroundColor: "#303030" backgroundColor: "#303030"
foregroundColor: "#ffffff" foregroundColor: "#ffffff"
headerBackgroundColor: "#303030"
headerForegroundColor: "#ffffff"
iconColor: "#fafafa" iconColor: "#fafafa"
} }

3
nymea-app/styles/energize/Style.qml
View File

@ -6,9 +6,6 @@ StyleBase {
backgroundColor: "#ffffff" backgroundColor: "#ffffff"
foregroundColor: "#638B87" foregroundColor: "#638B87"
headerBackgroundColor: "#ffffff"
headerForegroundColor: "#79a79f"
accentColor: "#8cc1b6" accentColor: "#8cc1b6"
interfaceColors: { interfaceColors: {

3
nymea-app/styles/lime/Style.qml
View File

@ -6,9 +6,6 @@ StyleBase {
backgroundColor: "#151515" backgroundColor: "#151515"
foregroundColor: "#fefefe" foregroundColor: "#fefefe"
headerBackgroundColor: backgroundColor
headerForegroundColor: foregroundColor
accentColor: "#ffb0d827" accentColor: "#ffb0d827"
iconColor: "#fafafa" iconColor: "#fafafa"
} }

3
nymea-app/styles/noir/Style.qml
View File

@ -6,9 +6,6 @@ StyleBase {
backgroundColor: "#50514f" backgroundColor: "#50514f"
foregroundColor: "#ebebeb" foregroundColor: "#ebebeb"
headerBackgroundColor: "#494948"
headerForegroundColor: foregroundColor
accentColor: "#f45b69" accentColor: "#f45b69"
iconColor: foregroundColor iconColor: foregroundColor

3
nymea-app/ui/Nymea.qml
View File

@ -50,7 +50,6 @@ ApplicationWindow {
Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
Material.background: Style.backgroundColor Material.background: Style.backgroundColor
Material.primary: Style.headerBackgroundColor
Material.accent: Style.accentColor Material.accent: Style.accentColor
Material.foreground: Style.foregroundColor Material.foreground: Style.foregroundColor
@ -91,7 +90,7 @@ ApplicationWindow {
Component.onCompleted: { Component.onCompleted: {
styleController.setSystemFont(app.font) styleController.setSystemFont(app.font)
PlatformHelper.topPanelColor = Style.headerBackgroundColor PlatformHelper.topPanelColor = Style.backgroundColor
PlatformHelper.bottomPanelColor = Style.backgroundColor PlatformHelper.bottomPanelColor = Style.backgroundColor
} }

3
nymea-app/ui/StyleBase.qml
View File

@ -7,9 +7,6 @@ Item {
property color accentColor: "#57baae" property color accentColor: "#57baae"
property color iconColor: "#808080" property color iconColor: "#808080"
property color headerBackgroundColor: "#ffffff"
property color headerForegroundColor: "#202020"
property color tileBackgroundColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.05)) property color tileBackgroundColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.05))
property color tileForegroundColor: foregroundColor property color tileForegroundColor: foregroundColor
property color tileOverlayColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.1)) property color tileOverlayColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.1))

6
nymea-app/ui/components/MainPageTabButton.qml
View File

@ -39,12 +39,6 @@ TabButton {
property string iconSource property string iconSource
property var alignment: Qt.Vertical property var alignment: Qt.Vertical
Rectangle {
anchors.fill: parent
color: Material.foreground
opacity: 0.05
}
contentItem: Item { contentItem: Item {
height: root.height height: root.height
Grid { Grid {