summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-12-20 17:08:18 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-12-20 17:08:21 -0800
commit68a15b8cdfd75a40b8deff279b6a19689606d396 (patch)
treea4348dd8e44b1c0f44f19a125f456801f1b83439
parent494e5c5a346a741248701fab2f1d5f3cafa82873 (diff)
downloadsubsurface-68a15b8cdfd75a40b8deff279b6a19689606d396.tar.gz
mobile/UI: cloud credentials follow our theming
This was simply not using our labels / text fields, so it didn't pick up our colors automatically. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--mobile-widgets/qml/CloudCredentials.qml16
-rw-r--r--mobile-widgets/qml/StartPage.qml6
2 files changed, 11 insertions, 11 deletions
diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml
index 46a97cac7..982b42c48 100644
--- a/mobile-widgets/qml/CloudCredentials.qml
+++ b/mobile-widgets/qml/CloudCredentials.qml
@@ -43,16 +43,16 @@ Item {
text: qsTr("Cloud credentials")
level: headingLevel
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
+ color: subsurfaceTheme.textColor
}
- Controls.Label {
+ TemplateLabelSmall {
text: qsTr("Email")
visible: !showPin
- font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.secondaryTextColor
}
- Controls.TextField {
+ TemplateTextField {
id: login
text: PrefCloudStorage.cloud_storage_email
visible: !showPin
@@ -61,14 +61,13 @@ Item {
Qt.ImhNoAutoUppercase
}
- Controls.Label {
+ TemplateLabelSmall {
text: qsTr("Password")
visible: !showPin
- font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.secondaryTextColor
}
- Controls.TextField {
+ TemplateTextField {
id: password
text: PrefCloudStorage.cloud_storage_password
visible: !showPin
@@ -79,11 +78,11 @@ Item {
Layout.fillWidth: true
}
- Controls.Label {
+ TemplateLabel {
text: qsTr("PIN")
visible: showPin
}
- Controls.TextField {
+ TemplateTextField {
id: pin
text: ""
Layout.fillWidth: true
@@ -147,6 +146,7 @@ Item {
}
}
TemplateButton {
+ Layout.margins: Kirigami.Units.smallSpacing
id: signin_forgot_password
text: qsTr("Forgot password?")
onClicked: {
diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml
index 3c4db1b73..18245bc85 100644
--- a/mobile-widgets/qml/StartPage.qml
+++ b/mobile-widgets/qml/StartPage.qml
@@ -17,7 +17,7 @@ Kirigami.ScrollablePage {
Layout.topMargin: 0
property int headingLevel: 3
}
- Controls.Label {
+ TemplateLabel {
id: messageArea
Layout.fillWidth: true
Layout.margins: Kirigami.Units.gridUnit
@@ -25,7 +25,7 @@ Kirigami.ScrollablePage {
text: manager.startPageText
wrapMode: Text.WordWrap
}
- Controls.Label {
+ TemplateLabel {
id: explanationTextBasic
visible: Backend.cloud_verification_status !== Enums.CS_NEED_TO_VERIFY
Layout.fillWidth: true
@@ -38,7 +38,7 @@ Kirigami.ScrollablePage {
"the no cloud button above.")
wrapMode: Text.WordWrap
}
- Controls.Label {
+ TemplateLabel {
id: explanationTextPin
visible: Backend.cloud_verification_status === Enums.CS_NEED_TO_VERIFY
Layout.fillWidth: true