git.iko.soy/unity8
on xenial help sign in
correct colors and spacing
3165eb4Lukáš Tinkl
qml/Wizard/Pages/60-uaccount-signup.qml+5−5
compare with xenial
unifiedsplit
@@ -72,7 +72,7 @@ LocalComponents.Page {
72 anchors.left: parent.left
72 anchors.left: parent.left
73 anchors.right: parent.right
73 anchors.right: parent.right
74 anchors.top: emailInput.bottom
74 anchors.top: emailInput.bottom
75− anchors.topMargin: units.gu(3)
75+ anchors.topMargin: units.gu(2)
76 wrapMode: Text.Wrap
76 wrapMode: Text.Wrap
77 text: i18n.tr("Your name:")
77 text: i18n.tr("Your name:")
78 color: textColor
78 color: textColor
@@ -94,7 +94,7 @@ LocalComponents.Page {
94 anchors.left: parent.left
94 anchors.left: parent.left
95 anchors.right: parent.right
95 anchors.right: parent.right
96 anchors.top: nameInput.bottom
96 anchors.top: nameInput.bottom
97− anchors.topMargin: units.gu(3)
97+ anchors.topMargin: units.gu(2)
98 wrapMode: Text.Wrap
98 wrapMode: Text.Wrap
99 text: i18n.tr("Password:")
99 text: i18n.tr("Password:")
100 color: textColor
100 color: textColor
@@ -127,7 +127,7 @@ LocalComponents.Page {
127 anchors.left: parent.left
127 anchors.left: parent.left
128 anchors.right: parent.right
128 anchors.right: parent.right
129 anchors.top: passMeter.bottom
129 anchors.top: passMeter.bottom
130− anchors.topMargin: passInput.text !== "" ? units.gu(6) : units.gu(3)
130+ anchors.topMargin: passInput.text !== "" ? units.gu(4) : units.gu(2)
131 wrapMode: Text.Wrap
131 wrapMode: Text.Wrap
132 text: i18n.tr("Repeat password:")
132 text: i18n.tr("Repeat password:")
133 color: textColor
133 color: textColor
@@ -151,7 +151,7 @@ LocalComponents.Page {
151 anchors.left: parent.left
151 anchors.left: parent.left
152 anchors.right: parent.right
152 anchors.right: parent.right
153 anchors.top: pass2Input.bottom
153 anchors.top: pass2Input.bottom
154− anchors.topMargin: units.gu(3)
154+ anchors.topMargin: units.gu(2)
155 text: i18n.tr("Encrypt my content")
155 text: i18n.tr("Encrypt my content")
156 KeyNavigation.tab: termsCheck
156 KeyNavigation.tab: termsCheck
157 }
157 }
@@ -163,7 +163,7 @@ LocalComponents.Page {
163 anchors.left: parent.left
163 anchors.left: parent.left
164 anchors.right: parent.right
164 anchors.right: parent.right
165 anchors.top: encryptCheck.bottom
165 anchors.top: encryptCheck.bottom
166− anchors.topMargin: units.gu(3)
166+ anchors.topMargin: units.gu(2)
167 text: i18n.tr("Opt out of cloud account (not recommended)")
167 text: i18n.tr("Opt out of cloud account (not recommended)")
168 KeyNavigation.tab: termsCheck
168 KeyNavigation.tab: termsCheck
169 visible: false // TODO re-enable in Phase 2
169 visible: false // TODO re-enable in Phase 2
qml/Wizard/Pages/75-report-check.qml+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014-2015 Canonical, Ltd.
2+ * Copyright (C) 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
qml/Wizard/PasswordMeter.qml+4−4
@@ -60,13 +60,13 @@ Item {
60 height: units.gu(1)
60 height: units.gu(1)
61 color: {
61 color: {
62 if (passwordScore > 80)
62 if (passwordScore > 80)
63− return "green";
63+ return okColor;
64 else if (passwordScore > 60)
64 else if (passwordScore > 60)
65− return "orange";
65+ return "#f9c00f";
66 else if (passwordScore >= 30)
66 else if (passwordScore >= 30)
67− return "red";
67+ return "#ed3146";
68
68
69− return "red";
69+ return "#ed3146";
70 }
70 }
71 visible: password.length > 0
71 visible: password.length > 0
72 }
72 }