aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-12-04 16:18:10 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-04 15:41:58 +0000
commite80e59061822013cc4857d58bcf8acaeafc1ad63 (patch)
tree8b8626e84ada6ee427d3b295c950aa420e3eb089
parent435c23be984691e3de645ae8ddff440e5f1786dd (diff)
Adapt default style to latest designs
Press fill colours were changed. Change-Id: Ic15039576c4e26aeef9933dab6fb0a0689550ab2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/imports/controls/Button.qml2
-rw-r--r--src/imports/controls/CheckBox.qml2
-rw-r--r--src/imports/controls/RadioButton.qml2
-rw-r--r--src/imports/controls/SpinBox.qml6
-rw-r--r--src/imports/controls/Switch.qml2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index cc7a65b8..7fd7580c 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -69,7 +69,7 @@ T.Button {
background: Rectangle {
implicitWidth: 100
implicitHeight: 40
- color: control.pressed ? (control.highlighted ? "#585a5c" : "#bdbebf") : (control.highlighted ? "#353637" : "#ffffff")
+ color: control.pressed ? (control.highlighted ? "#585a5c" : "#e4e4e4") : (control.highlighted ? "#353637" : "#ffffff")
border.color: control.pressed ? "#26282a" : "#353637"
}
//! [background]
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 5bfddbf3..8bc3cc9e 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -60,7 +60,7 @@ T.CheckBox {
x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
- color: control.enabled ? (control.pressed ? "#bdbebf" : "#ffffff") : "#353637"
+ color: control.enabled ? (control.pressed ? "#e4e4e4" : "#ffffff") : "#353637"
border.color: control.enabled ? (control.pressed ? "#26282a" : "#353637") : "transparent"
Image {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index e41d2d11..82d74b88 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -64,7 +64,7 @@ T.RadioButton {
radius: width / 2
border.width: 1
border.color: (control.pressed ? "#26282a" : "#353637")
- color: control.pressed ? "#bdbebf" : "#ffffff"
+ color: control.pressed ? "#e4e4e4" : "#ffffff"
Rectangle {
x: (parent.width - width) / 2
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index ff27d8ba..3933f5ab 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -67,7 +67,7 @@ T.SpinBox {
text: control.textFromValue(control.value, control.locale)
font: control.font
- color: control.enabled ? "#353637" : "#bdbebf"
+ color: "#353637"
// selectionColor: TODO
// selectedTextColor: TODO
horizontalAlignment: Qt.AlignHCenter
@@ -83,7 +83,7 @@ T.SpinBox {
x: control.mirrored ? 0 : parent.width - width
implicitWidth: 40
implicitHeight: 40
- color: up.pressed ? "#bdbebf" : "#ffffff"
+ color: up.pressed ? "#e4e4e4" : "#ffffff"
border.color: control.enabled ? "#353637" : "#bdbebf"
Rectangle {
@@ -108,7 +108,7 @@ T.SpinBox {
x: control.mirrored ? parent.width - width : 0
implicitWidth: 40
implicitHeight: 40
- color: down.pressed ? "#bdbebf" : "#ffffff"
+ color: down.pressed ? "#e4e4e4" : "#ffffff"
border.color: control.enabled ? "#353637" : "#bdbebf"
Rectangle {
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 3e224383..e1627d32 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -75,7 +75,7 @@ T.Switch {
width: 28
height: 28
radius: 16
- color: control.pressed ? "#bdbebf" : "#ffffff"
+ color: control.pressed ? "#e4e4e4" : "#ffffff"
border.width: 1
border.color: control.pressed ? "#26282a" : "#353637"