summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-08-28 22:14:33 +0700
committerAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-08-28 22:14:33 +0700
commitfdb561177da5e87cd183fd99ea93e7a887bd20ca (patch)
treeaea61fddbebfcefe024c1e384f1b76e52d84459b
parent88535f96afb0820c2e7ac1cd5b113f4f4a037c1b (diff)
parentca02af24030e48d965feb6c8549ec5da1a1e83fb (diff)
Merge branch 'development' of github.com:darapsa/kelakon
* 'development' of github.com:darapsa/kelakon: override button text to mixed case override button text to mixed case override button text to mixed case
-rw-r--r--LoginForm.ui.qml2
-rw-r--r--pages/EmailForm.ui.qml1
-rw-r--r--pages/PasswordForm.ui.qml1
3 files changed, 4 insertions, 0 deletions
diff --git a/LoginForm.ui.qml b/LoginForm.ui.qml
index dd16d23..b0c6e0a 100644
--- a/LoginForm.ui.qml
+++ b/LoginForm.ui.qml
@@ -15,6 +15,7 @@ Rectangle {
id: googleButton
text: qsTr("Continue with Google")
font.family: "Google Sans"
+ font.capitalization: Font.MixedCase
anchors.bottom: emailButton.top
anchors.bottomMargin: 8
anchors.right: parent.right
@@ -31,6 +32,7 @@ Rectangle {
text: qsTr("Continue with E-Mail")
flat: true
font.family: "Google Sans"
+ font.capitalization: Font.MixedCase
anchors.right: parent.right
anchors.rightMargin: 16
anchors.left: parent.left
diff --git a/pages/EmailForm.ui.qml b/pages/EmailForm.ui.qml
index ce5a990..d8f570c 100644
--- a/pages/EmailForm.ui.qml
+++ b/pages/EmailForm.ui.qml
@@ -80,6 +80,7 @@ Rectangle {
id: loginButton
text: qsTr("Next")
font.family: "Google Sans"
+ font.capitalization: Font.MixedCase
anchors.right: parent.right
anchors.rightMargin: 16
anchors.bottom: parent.bottom
diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml
index eceb1f8..c895d72 100644
--- a/pages/PasswordForm.ui.qml
+++ b/pages/PasswordForm.ui.qml
@@ -83,6 +83,7 @@ Rectangle {
y: 278
text: qsTr("Confirm password")
font.family: "Google Sans"
+ font.capitalization: Font.MixedCase
anchors.right: parent.right
anchors.rightMargin: 16
anchors.bottom: parent.bottom