git.iko.soy/unity8
on xenial help sign in
factor out colors, fix (missing) dividers
8a869a8Lukáš Tinkl
qml/Wizard/Page.qml+7−1
compare with xenial
unifiedsplit
@@ -30,6 +30,12 @@ Item {
30 readonly property real rightMargin: units.gu(3)
30 readonly property real rightMargin: units.gu(3)
31 readonly property real customMargin: units.gu(4) // margin for the custom (w/o title bar) pages
31 readonly property real customMargin: units.gu(4) // margin for the custom (w/o title bar) pages
32
32
33+ // colors
34+ readonly property color backgroundColor: "#fdfdfd"
35+ readonly property color dividerColor: "#cdcdcd"
36+ readonly property color textColor: "#525252"
37+ readonly property color errorColor: "#e14141"
38+
33 // If you want to skip a page, mark skipValid false while you figure out
39 // If you want to skip a page, mark skipValid false while you figure out
34 // whether to skip, then set it to true once you've determined the value
40 // whether to skip, then set it to true once you've determined the value
35 // of the skip property.
41 // of the skip property.
@@ -116,7 +122,7 @@ Item {
116 }
122 }
117 wrapMode: Text.Wrap
123 wrapMode: Text.Wrap
118 text: title
124 text: title
119− color: customTitle ? "#525252" : "#fdfdfd"
125+ color: customTitle ? textColor : backgroundColor
120 fontSize: "x-large"
126 fontSize: "x-large"
121 }
127 }
122 }
128 }
qml/Wizard/Pages/10-language.qml+2−2
@@ -115,7 +115,7 @@ LocalComponents.Page {
115
115
116 fontSize: "medium"
116 fontSize: "medium"
117 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
117 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
118− color: "#525252"
118+ color: textColor
119 }
119 }
120
120
121 Image {
121 Image {
@@ -146,7 +146,7 @@ LocalComponents.Page {
146 onClicked: {
146 onClicked: {
147 if (plugin.currentLanguage !== languagesListView.currentIndex) {
147 if (plugin.currentLanguage !== languagesListView.currentIndex) {
148 plugin.currentLanguage = languagesListView.currentIndex;
148 plugin.currentLanguage = languagesListView.currentIndex;
149− print("Updating session locale:", plugin.languageCodes[plugin.currentLanguage])
149+ print("Updating session locale:", plugin.languageCodes[plugin.currentLanguage]);
150 System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);
150 System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);
151 }
151 }
152 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
152 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
qml/Wizard/Pages/20-sim.qml+2−2
@@ -99,7 +99,7 @@ LocalComponents.Page {
99 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
99 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
100 fontSize: "small"
100 fontSize: "small"
101 font.weight: Font.Light
101 font.weight: Font.Light
102− color: restartDialog.visible ? Theme.palette.normal.backgroundText : "#525252"
102+ color: restartDialog.visible ? Theme.palette.normal.backgroundText : textColor
103 }
103 }
104
104
105 Label {
105 Label {
@@ -110,7 +110,7 @@ LocalComponents.Page {
110 text: i18n.tr("To proceed with no SIM tap <em>Skip</em>.")
110 text: i18n.tr("To proceed with no SIM tap <em>Skip</em>.")
111 fontSize: "small"
111 fontSize: "small"
112 font.weight: Font.Light
112 font.weight: Font.Light
113− color: restartDialog.visible ? Theme.palette.normal.backgroundText : "#525252"
113+ color: restartDialog.visible ? Theme.palette.normal.backgroundText : textColor
114 }
114 }
115 }
115 }
116
116
qml/Wizard/Pages/30-wifi.qml+2−2
@@ -101,7 +101,7 @@ LocalComponents.Page {
101
101
102 text: menuData && menuData.label || ""
102 text: menuData && menuData.label || ""
103 enabled: menuData && menuData.sensitive && !enterprise || false
103 enabled: menuData && menuData.sensitive && !enterprise || false
104− __foregroundColor: "#525252"
104+ __foregroundColor: textColor
105 showDivider: true
105 showDivider: true
106 iconName: {
106 iconName: {
107 var imageName = "nm-signal-100";
107 var imageName = "nm-signal-100";
@@ -150,7 +150,7 @@ LocalComponents.Page {
150 anchors.left: parent.left
150 anchors.left: parent.left
151 anchors.right: parent.right
151 anchors.right: parent.right
152 font.weight: Font.Light
152 font.weight: Font.Light
153− color: "#525252"
153+ color: "#68064d"
154 text: listview.count > 0 ? i18n.tr("Available Wi-Fi networks")
154 text: listview.count > 0 ? i18n.tr("Available Wi-Fi networks")
155 : i18n.tr("No available Wi-Fi networks")
155 : i18n.tr("No available Wi-Fi networks")
156 }
156 }
qml/Wizard/Pages/40-location.qml+38−8
@@ -65,7 +65,7 @@ LocalComponents.Page {
65 }
65 }
66
66
67 wrapMode: Text.WordWrap
67 wrapMode: Text.WordWrap
68− color: "#525252"
68+ color: textColor
69 font.weight: checked ? Font.Normal : Font.Light
69 font.weight: checked ? Font.Normal : Font.Light
70 text: i18n.tr("Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location (recommended)")
70 text: i18n.tr("Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location (recommended)")
71 property bool checked: true
71 property bool checked: true
@@ -93,7 +93,7 @@ LocalComponents.Page {
93 }
93 }
94
94
95 wrapMode: Text.WordWrap
95 wrapMode: Text.WordWrap
96− color: "#525252"
96+ color: textColor
97 font.weight: Font.Light
97 font.weight: Font.Light
98 fontSize: "small"
98 fontSize: "small"
99 linkColor: UbuntuColors.orange
99 linkColor: UbuntuColors.orange
@@ -110,18 +110,28 @@ LocalComponents.Page {
110 anchors.verticalCenter: hereCheckLabel.verticalCenter
110 anchors.verticalCenter: hereCheckLabel.verticalCenter
111 }
111 }
112
112
113+ Rectangle {
114+ id: divider
115+ anchors.left: parent.left
116+ anchors.right: parent.right
117+ anchors.top: hereTermsLabel.bottom
118+ anchors.topMargin: units.gu(3)
119+ height: units.dp(1)
120+ color: dividerColor
121+ }
122+
113 Label {
123 Label {
114 id: gpsCheckLabel
124 id: gpsCheckLabel
115 anchors {
125 anchors {
116 left: parent.left
126 left: parent.left
117 right: parent.right
127 right: parent.right
118− top: hereTermsLabel.bottom
128+ top: divider.bottom
119 topMargin: units.gu(3)
129 topMargin: units.gu(3)
120 rightMargin: rightMargin
130 rightMargin: rightMargin
121 }
131 }
122 text: i18n.tr("GPS only")
132 text: i18n.tr("GPS only")
123 wrapMode: Text.WordWrap
133 wrapMode: Text.WordWrap
124− color: "#525252"
134+ color: textColor
125 font.weight: checked ? Font.Normal : Font.Light
135 font.weight: checked ? Font.Normal : Font.Light
126 width: content.width
136 width: content.width
127 property bool checked: false
137 property bool checked: false
@@ -147,17 +157,27 @@ LocalComponents.Page {
147 anchors.verticalCenter: gpsCheckLabel.verticalCenter
157 anchors.verticalCenter: gpsCheckLabel.verticalCenter
148 }
158 }
149
159
160+ Rectangle {
161+ id: divider2
162+ anchors.left: parent.left
163+ anchors.right: parent.right
164+ anchors.top: gpsCheckLabel.bottom
165+ anchors.topMargin: units.gu(3)
166+ height: units.dp(1)
167+ color: dividerColor
168+ }
169+
150 Label {
170 Label {
151 id: nopeCheckLabel
171 id: nopeCheckLabel
152 anchors {
172 anchors {
153 left: parent.left
173 left: parent.left
154 right: parent.right
174 right: parent.right
155− top: gpsCheckLabel.bottom
175+ top: divider2.bottom
156 topMargin: units.gu(3)
176 topMargin: units.gu(3)
157 rightMargin: rightMargin
177 rightMargin: rightMargin
158 }
178 }
159 wrapMode: Text.WordWrap
179 wrapMode: Text.WordWrap
160− color: "#525252"
180+ color: textColor
161 font.weight: checked ? Font.Normal : Font.Light
181 font.weight: checked ? Font.Normal : Font.Light
162 width: content.width
182 width: content.width
163 text: i18n.tr("Don't use my location")
183 text: i18n.tr("Don't use my location")
@@ -184,18 +204,28 @@ LocalComponents.Page {
184 anchors.verticalCenter: nopeCheckLabel.verticalCenter
204 anchors.verticalCenter: nopeCheckLabel.verticalCenter
185 }
205 }
186
206
207+ Rectangle {
208+ id: divider3
209+ anchors.left: parent.left
210+ anchors.right: parent.right
211+ anchors.top: nopeCheckLabel.bottom
212+ anchors.topMargin: units.gu(3)
213+ height: units.dp(1)
214+ color: dividerColor
215+ }
216+
187 Label {
217 Label {
188 id: infoLabel
218 id: infoLabel
189 anchors {
219 anchors {
190 left: parent.left
220 left: parent.left
191 right: parent.right
221 right: parent.right
192− top: nopeCheckLabel.bottom
222+ top: divider3.bottom
193 topMargin: units.gu(3)
223 topMargin: units.gu(3)
194 }
224 }
195 wrapMode: Text.Wrap
225 wrapMode: Text.Wrap
196 textFormat: Text.RichText
226 textFormat: Text.RichText
197 text: i18n.tr("You can change it later in <em>System Settings</em>.")
227 text: i18n.tr("You can change it later in <em>System Settings</em>.")
198− color: "#525252"
228+ color: textColor
199 fontSize: "small"
229 fontSize: "small"
200 font.weight: Font.Light
230 font.weight: Font.Light
201 width: content.width
231 width: content.width
qml/Wizard/Pages/50-timezone.qml+4−4
@@ -52,7 +52,7 @@ LocalComponents.Page {
52 }
52 }
53 }
53 }
54
54
55− theme.palette.normal.backgroundText = "#525252" // "fix" the placeholder text in the search field
55+ theme.palette.normal.backgroundText = textColor // "fix" the placeholder text in the search field
56 }
56 }
57
57
58 Component {
58 Component {
@@ -69,14 +69,14 @@ LocalComponents.Page {
69 text: !!city ? city : ""
69 text: !!city ? city : ""
70 font.weight: tz.currentTz ? Font.Normal : Font.Light
70 font.weight: tz.currentTz ? Font.Normal : Font.Light
71 fontSize: "medium"
71 fontSize: "medium"
72− color: "#525252"
72+ color: textColor
73 }
73 }
74 Label {
74 Label {
75 id: timeLabel
75 id: timeLabel
76 text: !!time ? time + " " + abbreviation : ""
76 text: !!time ? time + " " + abbreviation : ""
77 font.weight: tz.currentTz ? Font.Normal : Font.Light
77 font.weight: tz.currentTz ? Font.Normal : Font.Light
78 fontSize: "small"
78 fontSize: "small"
79− color: "#525252"
79+ color: textColor
80 }
80 }
81 }
81 }
82 Image {
82 Image {
@@ -122,7 +122,7 @@ LocalComponents.Page {
122 id: tzList;
122 id: tzList;
123
123
124 boundsBehavior: Flickable.StopAtBounds
124 boundsBehavior: Flickable.StopAtBounds
125− clip: true;
125+ clip: true
126 currentIndex: -1
126 currentIndex: -1
127 snapMode: ListView.SnapToItem
127 snapMode: ListView.SnapToItem
128
128
qml/Wizard/Pages/70-passwd-type.qml+47−27
@@ -40,24 +40,24 @@ LocalComponents.Page {
40
40
41 function indexToMethod(index) {
41 function indexToMethod(index) {
42 if (index === 1)
42 if (index === 1)
43− return UbuntuSecurityPrivacyPanel.Passcode
43+ return UbuntuSecurityPrivacyPanel.Passcode;
44 else if (index === 0)
44 else if (index === 0)
45− return UbuntuSecurityPrivacyPanel.Passphrase
45+ return UbuntuSecurityPrivacyPanel.Passphrase;
46 else
46 else
47− return UbuntuSecurityPrivacyPanel.Swipe
47+ return UbuntuSecurityPrivacyPanel.Swipe;
48 }
48 }
49
49
50 function methodToIndex(method) {
50 function methodToIndex(method) {
51 if (method === UbuntuSecurityPrivacyPanel.Passcode)
51 if (method === UbuntuSecurityPrivacyPanel.Passcode)
52− return 1
52+ return 1;
53 else if (method === UbuntuSecurityPrivacyPanel.Passphrase)
53 else if (method === UbuntuSecurityPrivacyPanel.Passphrase)
54− return 0
54+ return 0;
55 else
55 else
56− return 2
56+ return 2;
57 }
57 }
58
58
59 Component.onCompleted: {
59 Component.onCompleted: {
60− selector.currentIndex = methodToIndex(root.passwordMethod)
60+ selector.currentIndex = methodToIndex(root.passwordMethod);
61 }
61 }
62
62
63 Item {
63 Item {
@@ -71,20 +71,28 @@ LocalComponents.Page {
71 anchors.right: parent.right
71 anchors.right: parent.right
72 wrapMode: Text.Wrap
72 wrapMode: Text.Wrap
73 text: i18n.tr("Choose lock screen security")
73 text: i18n.tr("Choose lock screen security")
74− color: "#525252"
74+ color: textColor
75 fontSize: "small"
75 fontSize: "small"
76 font.weight: Font.Light
76 font.weight: Font.Light
77 }
77 }
78
78
79− ListView {
79+ Rectangle {
80− id: selector
80+ id: divider
81 anchors.left: parent.left
81 anchors.left: parent.left
82 anchors.right: parent.right
82 anchors.right: parent.right
83 anchors.top: infoLabel.bottom
83 anchors.top: infoLabel.bottom
84 anchors.topMargin: units.gu(3)
84 anchors.topMargin: units.gu(3)
85+ height: units.dp(1)
86+ color: dividerColor
87+ }
85
88
89+ ListView {
90+ id: selector
91+ anchors.left: parent.left
92+ anchors.right: parent.right
93+ anchors.top: divider.bottom
86− boundsBehavior: Flickable.StopAtBounds;
94+ boundsBehavior: Flickable.StopAtBounds
87− clip: true;
95+ clip: true
88 height: childrenRect.height
96 height: childrenRect.height
89
97
90 // this is the order we want to display it; cf indexToMethod()
98 // this is the order we want to display it; cf indexToMethod()
@@ -93,27 +101,30 @@ LocalComponents.Page {
93 delegate: ListItem {
101 delegate: ListItem {
94 id: itemDelegate
102 id: itemDelegate
95 readonly property bool isCurrent: index === ListView.view.currentIndex
103 readonly property bool isCurrent: index === ListView.view.currentIndex
104+ highlightColor: backgroundColor
105+ divider.colorFrom: dividerColor
106+ divider.colorTo: backgroundColor
96 Label {
107 Label {
97 id: methodLabel
108 id: methodLabel
98 objectName: "passwdDelegate" + index
109 objectName: "passwdDelegate" + index
99 anchors.verticalCenter: parent.verticalCenter;
110 anchors.verticalCenter: parent.verticalCenter;
100 fontSize: "medium"
111 fontSize: "medium"
101− color: "#525252"
112+ color: textColor
102 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
113 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
103 text: {
114 text: {
104 var method = modelData
115 var method = modelData
105 var name = ""
116 var name = ""
106 var desc = ""
117 var desc = ""
107 if (method === UbuntuSecurityPrivacyPanel.Swipe) {
118 if (method === UbuntuSecurityPrivacyPanel.Swipe) {
108− return i18n.ctr("Label: Type of security method", "None")
119+ return i18n.ctr("Label: Type of security method", "None");
109 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
120 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
110− name = i18n.ctr("Label: Type of security method", "Passcode")
121+ name = i18n.ctr("Label: Type of security method", "Passcode");
111− desc = i18n.ctr("Label: Description of security method", "4 digits only")
122+ desc = i18n.ctr("Label: Description of security method", "4 digits only");
112 } else {
123 } else {
113− name = i18n.ctr("Label: Type of security method", "Password")
124+ name = i18n.ctr("Label: Type of security method", "Password");
114− desc = i18n.ctr("Label: Description of security method", "numbers and letters")
125+ desc = i18n.ctr("Label: Description of security method", "numbers and letters");
115 }
126 }
116− return "%1 (%2)".arg(name).arg(desc)
127+ return "%1 (%2)".arg(name).arg(desc);
117 }
128 }
118 }
129 }
119
130
@@ -130,11 +141,20 @@ LocalComponents.Page {
130 }
141 }
131
142
132 onClicked: {
143 onClicked: {
133− selector.currentIndex = index
144+ selector.currentIndex = index;
134− print("Current method: " + indexToMethod(index))
145+ print("Current method: " + indexToMethod(index));
135 }
146 }
136 }
147 }
137 }
148 }
149+
150+ Rectangle {
151+ id: divider2
152+ anchors.left: parent.left
153+ anchors.right: parent.right
154+ anchors.top: selector.bottom
155+ height: units.dp(1)
156+ color: dividerColor
157+ }
138 }
158 }
139
159
140 Component {
160 Component {
@@ -142,16 +162,16 @@ LocalComponents.Page {
142 LocalComponents.StackButton {
162 LocalComponents.StackButton {
143 text: i18n.tr("Next")
163 text: i18n.tr("Next")
144 onClicked: {
164 onClicked: {
145− var method = indexToMethod(selector.currentIndex)
165+ var method = indexToMethod(selector.currentIndex);
146− root.passwordMethod = method
166+ root.passwordMethod = method;
147− print("Current method: " + root.passwordMethod)
167+ print("Current method: " + root.passwordMethod);
148
168
149 if (method === UbuntuSecurityPrivacyPanel.Passphrase) {
169 if (method === UbuntuSecurityPrivacyPanel.Passphrase) {
150− pageStack.load(Qt.resolvedUrl("password-set.qml"))
170+ pageStack.load(Qt.resolvedUrl("password-set.qml"));
151 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
171 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
152− pageStack.load(Qt.resolvedUrl("passcode-set.qml"))
172+ pageStack.load(Qt.resolvedUrl("passcode-set.qml"));
153 } else {
173 } else {
154− pageStack.next()
174+ pageStack.next();
155 }
175 }
156 }
176 }
157 }
177 }
qml/Wizard/Pages/80-finished.qml+1−1
@@ -60,7 +60,7 @@ LocalComponents.Page {
60 anchors.horizontalCenter: parent.horizontalCenter
60 anchors.horizontalCenter: parent.horizontalCenter
61 text: i18n.tr("Get Started")
61 text: i18n.tr("Get Started")
62 onClicked: {
62 onClicked: {
63− root.quitWizard()
63+ root.quitWizard();
64 }
64 }
65 }
65 }
66 }
66 }
qml/Wizard/Pages/here-terms.qml+5−5
@@ -62,7 +62,7 @@ LocalComponents.Page {
62 anchors.left: parent.left
62 anchors.left: parent.left
63 anchors.right: parent.right
63 anchors.right: parent.right
64 wrapMode: Text.Wrap
64 wrapMode: Text.Wrap
65− color: "black"
65+ color: textColor
66 fontSize: "small"
66 fontSize: "small"
67 font.weight: Font.Light
67 font.weight: Font.Light
68 text: i18n.tr("Your device uses positioning technologies provided by HERE.")
68 text: i18n.tr("Your device uses positioning technologies provided by HERE.")
@@ -73,7 +73,7 @@ LocalComponents.Page {
73 anchors.left: parent.left
73 anchors.left: parent.left
74 anchors.right: parent.right
74 anchors.right: parent.right
75 wrapMode: Text.Wrap
75 wrapMode: Text.Wrap
76− color: "black"
76+ color: textColor
77 fontSize: "small"
77 fontSize: "small"
78 font.weight: Font.Light
78 font.weight: Font.Light
79 text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
79 text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
@@ -86,7 +86,7 @@ LocalComponents.Page {
86 anchors.left: parent.left
86 anchors.left: parent.left
87 anchors.right: parent.right
87 anchors.right: parent.right
88 wrapMode: Text.Wrap
88 wrapMode: Text.Wrap
89− color: "black"
89+ color: textColor
90 fontSize: "small"
90 fontSize: "small"
91 font.weight: Font.Light
91 font.weight: Font.Light
92 text: i18n.tr("The information collected is used to analyze the service and to " +
92 text: i18n.tr("The information collected is used to analyze the service and to " +
@@ -98,7 +98,7 @@ LocalComponents.Page {
98 anchors.left: parent.left
98 anchors.left: parent.left
99 anchors.right: parent.right
99 anchors.right: parent.right
100 wrapMode: Text.Wrap
100 wrapMode: Text.Wrap
101− color: "black"
101+ color: textColor
102 fontSize: "small"
102 fontSize: "small"
103 font.weight: Font.Light
103 font.weight: Font.Light
104 linkColor: UbuntuColors.orange
104 linkColor: UbuntuColors.orange
@@ -115,7 +115,7 @@ LocalComponents.Page {
115 anchors.left: parent.left
115 anchors.left: parent.left
116 anchors.right: parent.right
116 anchors.right: parent.right
117 wrapMode: Text.Wrap
117 wrapMode: Text.Wrap
118− color: "black"
118+ color: textColor
119 fontSize: "small"
119 fontSize: "small"
120 font.weight: Font.Light
120 font.weight: Font.Light
121 linkColor: UbuntuColors.orange
121 linkColor: UbuntuColors.orange
qml/Wizard/Pages/passcode-confirm.qml+1−1
@@ -49,7 +49,7 @@ LocalComponents.Page {
49
49
50 errorText: i18n.tr("Incorrect passcode.") + "\n" + i18n.tr("Please re-enter.")
50 errorText: i18n.tr("Incorrect passcode.") + "\n" + i18n.tr("Please re-enter.")
51
51
52− foregroundColor: "#525252"
52+ foregroundColor: textColor
53
53
54 showEmergencyCallButton: false
54 showEmergencyCallButton: false
55 showCancelButton: false
55 showCancelButton: false
qml/Wizard/Pages/passcode-set.qml+1−1
@@ -57,7 +57,7 @@ LocalComponents.Page {
57 }
57 }
58
58
59 infoText: i18n.tr("Choose passcode")
59 infoText: i18n.tr("Choose passcode")
60− foregroundColor: "#525252"
60+ foregroundColor: textColor
61
61
62 // Note that the number four comes from PAM settings,
62 // Note that the number four comes from PAM settings,
63 // which we don't have a good way to interrogate. We
63 // which we don't have a good way to interrogate. We
qml/Wizard/Pages/password-set.qml+1−1
@@ -86,7 +86,7 @@ LocalComponents.Page {
86 right: parent.right
86 right: parent.right
87 }
87 }
88 wrapMode: Text.Wrap
88 wrapMode: Text.Wrap
89− color: hasError ? "#e14141": "#525252"
89+ color: hasError ? errorColor : textColor
90 }
90 }
91
91
92 TextField {
92 TextField {
qml/Wizard/Pages/uaccount-signin.qml+2−2
@@ -40,7 +40,7 @@ LocalComponents.Page {
40 anchors.right: parent.right
40 anchors.right: parent.right
41 wrapMode: Text.Wrap
41 wrapMode: Text.Wrap
42 text: i18n.tr("Email:")
42 text: i18n.tr("Email:")
43− color: "#525252"
43+ color: textColor
44 font.weight: Font.Light
44 font.weight: Font.Light
45 }
45 }
46
46
@@ -65,7 +65,7 @@ LocalComponents.Page {
65 anchors.topMargin: units.gu(3)
65 anchors.topMargin: units.gu(3)
66 wrapMode: Text.Wrap
66 wrapMode: Text.Wrap
67 text: i18n.tr("Password:")
67 text: i18n.tr("Password:")
68− color: "#525252"
68+ color: textColor
69 font.weight: Font.Light
69 font.weight: Font.Light
70 }
70 }
71
71
qml/Wizard/Pages/uaccount-signup.qml+4−4
@@ -37,7 +37,7 @@ LocalComponents.Page {
37 anchors.right: parent.right
37 anchors.right: parent.right
38 wrapMode: Text.Wrap
38 wrapMode: Text.Wrap
39 text: i18n.tr("Email:")
39 text: i18n.tr("Email:")
40− color: "#525252"
40+ color: textColor
41 font.weight: Font.Light
41 font.weight: Font.Light
42 }
42 }
43
43
@@ -63,7 +63,7 @@ LocalComponents.Page {
63 anchors.topMargin: units.gu(3)
63 anchors.topMargin: units.gu(3)
64 wrapMode: Text.Wrap
64 wrapMode: Text.Wrap
65 text: i18n.tr("Your name:")
65 text: i18n.tr("Your name:")
66− color: "#525252"
66+ color: textColor
67 font.weight: Font.Light
67 font.weight: Font.Light
68 }
68 }
69
69
@@ -85,7 +85,7 @@ LocalComponents.Page {
85 anchors.topMargin: units.gu(3)
85 anchors.topMargin: units.gu(3)
86 wrapMode: Text.Wrap
86 wrapMode: Text.Wrap
87 text: i18n.tr("Password:")
87 text: i18n.tr("Password:")
88− color: "#525252"
88+ color: textColor
89 font.weight: Font.Light
89 font.weight: Font.Light
90 }
90 }
91
91
@@ -118,7 +118,7 @@ LocalComponents.Page {
118 anchors.topMargin: passInput.text !== "" ? units.gu(6) : units.gu(3)
118 anchors.topMargin: passInput.text !== "" ? units.gu(6) : units.gu(3)
119 wrapMode: Text.Wrap
119 wrapMode: Text.Wrap
120 text: i18n.tr("Repeat password:")
120 text: i18n.tr("Repeat password:")
121− color: "#525252"
121+ color: textColor
122 font.weight: Font.Light
122 font.weight: Font.Light
123 }
123 }
124
124
qml/Wizard/Pages/uaccount.qml+1−1
@@ -35,7 +35,7 @@ LocalComponents.Page {
35 anchors.right: parent.right
35 anchors.right: parent.right
36 wrapMode: Text.Wrap
36 wrapMode: Text.Wrap
37 text: i18n.tr("Secure my device using my Ubuntu account")
37 text: i18n.tr("Secure my device using my Ubuntu account")
38− color: "#525252"
38+ color: textColor
39 font.weight: Font.Light
39 font.weight: Font.Light
40 fontSize: "small"
40 fontSize: "small"
41 }
41 }
qml/Wizard/StackButton.qml+2−1
@@ -32,8 +32,9 @@ AbstractButton {
32 anchors.verticalCenter: parent.verticalCenter
32 anchors.verticalCenter: parent.verticalCenter
33 anchors.left: parent.left
33 anchors.left: parent.left
34 anchors.right: parent.right
34 anchors.right: parent.right
35− color: "#525252"
35+ color: textColor
36 opacity: enabled ? 1.0 : 0.5
36 opacity: enabled ? 1.0 : 0.5
37+ fontSize: "medium"
37 font.weight: backArrow ? Font.Normal : Font.DemiBold
38 font.weight: backArrow ? Font.Normal : Font.DemiBold
38 text: stackButton.text
39 text: stackButton.text
39 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
40 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight