Increase fonts and buttons sizes

So it is easier to read and click.

Change-Id: Icd63dae8dd4bf9794897e41ad8cb365f79fc63ed
Reviewed-by: Niels Weber <niels.weber@digia.com>

5 files changed, 11 insertions, 10 deletions

diff --git a/qml/components/ConferenceSwitcher.qml b/qml/components/ConferenceSwitcher.qml
index 22e0cfd..cb27ddd 100644
--- a/qml/components/ConferenceSwitcher.qml
+++ b/qml/components/ConferenceSwitcher.qml
@@ -87,7 +87,7 @@ Rectangle {
                     else
                         initialConferenceSelected()
                 }
-                width: window.width / 3.5
+                width: Theme.sizes.buttonWidth
                 height: Theme.sizes.buttonHeight
                 style: ButtonStyle {
                     background: Rectangle {
@@ -102,7 +102,7 @@ Rectangle {
                         verticalAlignment: Text.AlignVCenter
                         text: control.text
                         color: applicationClient.currentConferenceId === id ? Theme.colors.white : Theme.colors.qtgreen
-                        font.pointSize: Theme.fonts.six_pt
+                        font.pointSize: Theme.fonts.seven_pt
                         font.capitalization: Font.AllUppercase
                     }
                 }
diff --git a/qml/components/Event.qml b/qml/components/Event.qml
index a813044..f38776c 100644
--- a/qml/components/Event.qml
+++ b/qml/components/Event.qml
@@ -125,7 +125,7 @@ Rectangle {
                             text: control.text
                             color: Theme.colors.white
                             font.capitalization: Font.AllUppercase
-                            font.pointSize: Theme.fonts.six_pt
+                            font.pointSize: Theme.fonts.seven_pt
                         }
                     }
                     onClicked: {
diff --git a/qml/components/Feedback.qml b/qml/components/Feedback.qml
index 6645ff9..1558be0 100644
--- a/qml/components/Feedback.qml
+++ b/qml/components/Feedback.qml
@@ -126,8 +126,9 @@ Item {
                 anchors.fill: parent
                 textMargin: Theme.margins.ten
                 wrapMode: TextEdit.Wrap
-                onFocusChanged: text = ""
+                onFocusChanged: if (focus && text === Theme.text.writeYourCommentHere) text = ""
                 textColor: text === Theme.text.writeYourCommentHere ? Theme.colors.gray : Theme.colors.black
+                font.pointSize: Theme.fonts.seven_pt
                 Component.onCompleted: text = Theme.text.writeYourCommentHere
             }
         }
@@ -139,7 +140,7 @@ Item {
                     rating = -1
                     feedbackEdit.text = Theme.text.writeYourCommentHere
                 }
-                width: window.width / 3.5
+                width: Theme.sizes.buttonWidth
                 height: Theme.sizes.buttonHeight
                 style: ButtonStyle {
                     background: Rectangle {
@@ -153,7 +154,7 @@ Item {
                         text: control.text
                         color: Theme.colors.qtgreen
                         font.capitalization: Font.AllUppercase
-                        font.pointSize: Theme.fonts.six_pt
+                        font.pointSize: Theme.fonts.seven_pt
                     }
                 }
             }
@@ -167,7 +168,7 @@ Item {
                     ModelsSingleton.saveFeedback(feedbackEdit.text, eventId, rating)
                     stack.pop()
                 }
-                width: window.width / 3.5
+                width: Theme.sizes.buttonWidth
                 height: Theme.sizes.buttonHeight
                 style: ButtonStyle {
                     background: Rectangle {
@@ -180,7 +181,7 @@ Item {
                         text: control.text
                         color: control.enabled ? Theme.colors.white : Theme.colors.gray
                         font.capitalization: Font.AllUppercase
-                        font.pointSize: Theme.fonts.six_pt
+                        font.pointSize: Theme.fonts.seven_pt
                     }
                 }
             }
diff --git a/qml/components/HomeScreen.qml b/qml/components/HomeScreen.qml
index 42988af..8432289 100644
--- a/qml/components/HomeScreen.qml
+++ b/qml/components/HomeScreen.qml
@@ -170,7 +170,7 @@ Rectangle {
                         upcomingItem.visibleDate = Qt.formatDate(sortModelNextEvents.get(0, "start"), upcomingItem.formatDate)
                     }
                 }
-                spacing: Theme.margins.twenty
+                spacing: Theme.margins.ten
                 delegate: RowLayout {
                     id: upcomingEventDelegate
                     width: parent.width
diff --git a/qml/main.qml b/qml/main.qml
index 3c18d2d..e1d4e01 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -131,7 +131,7 @@ ApplicationWindow {
                         width: parent.width
                         text: name
                         color: mouseArea.pressed ? Theme.colors.white : Theme.colors.blue_menu
-                        font.pointSize: Theme.fonts.eight_pt
+                        font.pointSize: Theme.fonts.ten_pt
                         verticalAlignment: Text.AlignVCenter
                         horizontalAlignment: Text.AlignHCenter
                     }