diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-10-23 13:30:05 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:41:51 +0000 |
| commit | 2b649a7da1980975117fd79769251cc433cebf1e (patch) | |
| tree | b17661378a9759bbef38cf2fa0734dfd0f06acb3 /src/settingsui/settingsuiplugin | |
| parent | f2f43cdcd05d52495dbe049c7d007900f42bafac (diff) | |
Move theme color definitions to one place
Task-number: QTBUG-60084
Change-Id: Ie80c9ebc26bd7925c7f0f67404878818675c0f06
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui/settingsuiplugin')
| -rw-r--r-- | src/settingsui/settingsuiplugin/SettingsDelegate.qml | 4 | ||||
| -rw-r--r-- | src/settingsui/settingsuiplugin/ShutdownPopup.qml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/settingsui/settingsuiplugin/SettingsDelegate.qml b/src/settingsui/settingsuiplugin/SettingsDelegate.qml index abb864e..91f4ca4 100644 --- a/src/settingsui/settingsuiplugin/SettingsDelegate.qml +++ b/src/settingsui/settingsuiplugin/SettingsDelegate.qml @@ -52,7 +52,7 @@ Item { source: img anchors.fill: img visible: parent.isSelected ? true : false - color: "#41cd52" + color: viewSettings.buttonGreenColor } Text { @@ -65,7 +65,7 @@ Item { fontSizeMode: Text.Fit minimumPixelSize: 1 font.pixelSize: Math.min(parent.width * 0.25, parent.height) - color: parent.isSelected ? "#41cd52" : "white" + color: parent.isSelected ? viewSettings.buttonGreenColor : "white" wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter font.family: appFont diff --git a/src/settingsui/settingsuiplugin/ShutdownPopup.qml b/src/settingsui/settingsuiplugin/ShutdownPopup.qml index b1ce3e4..1ce4480 100644 --- a/src/settingsui/settingsuiplugin/ShutdownPopup.qml +++ b/src/settingsui/settingsuiplugin/ShutdownPopup.qml @@ -32,7 +32,7 @@ Rectangle { id: shutdownPopup width: parent.width height: parent.height - color: "#09102b" + color: viewSettings.backgroundColor opacity: 0.9 signal accepted() @@ -60,8 +60,8 @@ Rectangle { Rectangle { id: frame - color: "#09102b" - border.color: "#9d9faa" + color: viewSettings.backgroundColor + border.color: viewSettings.borderColor border.width: 3 anchors.centerIn: parent width: parent.width * 0.35 |