on xenial help sign in
correct colors and spacing
commit3165eb493067b2e12281275c0f859921c06c3d79 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 9 Sep 2015, 15:52 (11 years ago) parent09fa1a3
3 files changed+10−10
qml/Wizard/Pages/60-uaccount-signup.qml+5−5 qml/Wizard/Pages/75-report-check.qml+1−1 qml/Wizard/PasswordMeter.qml+4−4
qml/Wizard/Pages/60-uaccount-signup.qml+5−5
@@ -72,7 +72,7 @@ LocalComponents.Page {
7272 anchors.left: parent.left
7373 anchors.right: parent.right
7474 anchors.top: emailInput.bottom
75− anchors.topMargin: units.gu(3)
75+ anchors.topMargin: units.gu(2)
7676 wrapMode: Text.Wrap
7777 text: i18n.tr("Your name:")
7878 color: textColor
@@ -94,7 +94,7 @@ LocalComponents.Page {
9494 anchors.left: parent.left
9595 anchors.right: parent.right
9696 anchors.top: nameInput.bottom
97− anchors.topMargin: units.gu(3)
97+ anchors.topMargin: units.gu(2)
9898 wrapMode: Text.Wrap
9999 text: i18n.tr("Password:")
100100 color: textColor
@@ -127,7 +127,7 @@ LocalComponents.Page {
127127 anchors.left: parent.left
128128 anchors.right: parent.right
129129 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)
131131 wrapMode: Text.Wrap
132132 text: i18n.tr("Repeat password:")
133133 color: textColor
@@ -151,7 +151,7 @@ LocalComponents.Page {
151151 anchors.left: parent.left
152152 anchors.right: parent.right
153153 anchors.top: pass2Input.bottom
154− anchors.topMargin: units.gu(3)
154+ anchors.topMargin: units.gu(2)
155155 text: i18n.tr("Encrypt my content")
156156 KeyNavigation.tab: termsCheck
157157 }
@@ -163,7 +163,7 @@ LocalComponents.Page {
163163 anchors.left: parent.left
164164 anchors.right: parent.right
165165 anchors.top: encryptCheck.bottom
166− anchors.topMargin: units.gu(3)
166+ anchors.topMargin: units.gu(2)
167167 text: i18n.tr("Opt out of cloud account (not recommended)")
168168 KeyNavigation.tab: termsCheck
169169 visible: false // TODO re-enable in Phase 2
qml/Wizard/Pages/75-report-check.qml+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014-2015 Canonical, Ltd.
2+ * Copyright (C) 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
qml/Wizard/PasswordMeter.qml+4−4
@@ -60,13 +60,13 @@ Item {
6060 height: units.gu(1)
6161 color: {
6262 if (passwordScore > 80)
63− return "green";
63+ return okColor;
6464 else if (passwordScore > 60)
65− return "orange";
65+ return "#f9c00f";
6666 else if (passwordScore >= 30)
67− return "red";
67+ return "#ed3146";
6868
69− return "red";
69+ return "#ed3146";
7070 }
7171 visible: password.length > 0
7272 }