diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-09-16 12:17:01 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-09-16 12:58:50 +0200 |
| commit | 40a67c211db626e9a502cb187de7567e54b4aa22 (patch) | |
| tree | 5adb8f9cc716c992d91e7e17d3f6970fa15d0d43 | |
| parent | c7428210d56f4af2be0050fb7934fb28a037f032 (diff) | |
Update the feedback's buttons design
To follow the specification.
Change-Id: Ibd49d7d21d7ed538985e8b4e0a5b572fc4329db0
Reviewed-by: Niels Weber <niels.weber@digia.com>
| -rw-r--r-- | qml/components/Event.qml | 4 | ||||
| -rw-r--r-- | qml/components/Feedback.qml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qml/components/Event.qml b/qml/components/Event.qml index 4de0b93..bf6d80d 100644 --- a/qml/components/Event.qml +++ b/qml/components/Event.qml @@ -114,7 +114,6 @@ Rectangle { Layout.preferredWidth: Theme.sizes.buttonWidth style: ButtonStyle { background: Rectangle { - radius: 5 border.width: 2 border.color: Theme.colors.qtgreen color: control.pressed ? Qt.darker(Theme.colors.qtgreen, 1.1) : Theme.colors.qtgreen @@ -123,7 +122,8 @@ Rectangle { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter text: control.text - color: Theme.colors.black + color: Theme.colors.white + font.capitalization: Font.AllUppercase font.pointSize: Theme.fonts.six_pt } } diff --git a/qml/components/Feedback.qml b/qml/components/Feedback.qml index 47a7ac3..6645ff9 100644 --- a/qml/components/Feedback.qml +++ b/qml/components/Feedback.qml @@ -143,7 +143,6 @@ Item { height: Theme.sizes.buttonHeight style: ButtonStyle { background: Rectangle { - radius: 5 border.width: 2 border.color: Theme.colors.qtgreen color: control.pressed ? Qt.darker(Theme.colors.white, 1.1) : Theme.colors.white @@ -152,7 +151,8 @@ Item { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter text: control.text - color: Theme.colors.black + color: Theme.colors.qtgreen + font.capitalization: Font.AllUppercase font.pointSize: Theme.fonts.six_pt } } @@ -171,7 +171,6 @@ Item { height: Theme.sizes.buttonHeight style: ButtonStyle { background: Rectangle { - radius: 5 color: control.enabled ? (control.pressed ? Qt.darker(Theme.colors.qtgreen, 1.1) : Theme.colors.qtgreen) : Theme.colors.smokewhite } @@ -179,7 +178,8 @@ Item { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter text: control.text - color: control.enabled ? Theme.colors.black : Theme.colors.gray + color: control.enabled ? Theme.colors.white : Theme.colors.gray + font.capitalization: Font.AllUppercase font.pointSize: Theme.fonts.six_pt } } |