git.iko.soy/unity8
on xenial help sign in
more visuals matching
commit305af2fdd8996f45af3584d302f1919de4812e3d authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 9 Jul 2015, 18:14 (11 years ago) parent4af7183
11 files changed+20−18
compare with xenial
unifiedsplit
qml/Wizard/CheckableSetting.qml+2−1 qml/Wizard/Page.qml+1−1 qml/Wizard/Pages/10-language.qml+1−1 qml/Wizard/Pages/15-country.qml+1−1 qml/Wizard/Pages/20-sim.qml+2−2 qml/Wizard/Pages/30-wifi.qml+1−1 qml/Wizard/Pages/40-timezone.qml+2−2 qml/Wizard/Pages/50-location.qml+5−5 qml/Wizard/Pages/70-reporting.qml+1 qml/Wizard/Pages/80-finished.qml+1−2 qml/Wizard/StackButton.qml+3−2
qml/Wizard/CheckableSetting.qml+2−1
@@ -78,8 +78,9 @@ ListItem.Empty {
7878 }
7979 wrapMode: Text.Wrap
8080 linkColor: Theme.palette.normal.foregroundText
81− color: "black"
81+ color: "#525252"
8282 font.weight: Font.Light
83+ fontSize: "small"
8384 onLinkActivated: listItem.linkActivated(link)
8485 }
8586 }
qml/Wizard/Page.qml+1−1
@@ -103,7 +103,7 @@ Item {
103103 }
104104 wrapMode: Text.Wrap
105105 text: title
106− color: customTitle ? "black" : "white"
106+ color: customTitle ? "#525252" : "#fdfdfd"
107107 fontSize: "x-large"
108108 }
109109 }
qml/Wizard/Pages/10-language.qml+1−1
@@ -131,7 +131,7 @@ LocalComponents.Page {
131131
132132 fontSize: "medium"
133133 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
134− color: "black" // FIXME proper color from the theme
134+ color: "#525252"
135135 }
136136
137137 Image {
qml/Wizard/Pages/15-country.qml+1−1
@@ -127,7 +127,7 @@ LocalComponents.Page {
127127
128128 fontSize: "medium"
129129 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
130− color: "black" // FIXME proper color from the theme
130+ color: "#525252"
131131 }
132132
133133 Image {
qml/Wizard/Pages/20-sim.qml+2−2
@@ -77,7 +77,7 @@ LocalComponents.Page {
7777 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
7878 fontSize: "small"
7979 font.weight: Font.Light
80− color: restartDialog.visible ? Theme.palette.normal.backgroundText : "black"
80+ color: restartDialog.visible ? Theme.palette.normal.backgroundText : "#525252"
8181 }
8282
8383 Label {
@@ -88,7 +88,7 @@ LocalComponents.Page {
8888 text: i18n.tr("To proceed with no SIM tap <em>Skip</em>.")
8989 fontSize: "small"
9090 font.weight: Font.Light
91− color: restartDialog.visible ? Theme.palette.normal.backgroundText : "black"
91+ color: restartDialog.visible ? Theme.palette.normal.backgroundText : "#525252"
9292 }
9393 }
9494
qml/Wizard/Pages/30-wifi.qml+1−1
@@ -162,7 +162,7 @@ LocalComponents.Page {
162162 anchors.right: parent.right
163163 fontSize: "small"
164164 font.weight: Font.Light
165− color: "black"
165+ color: "#525252"
166166 text: mainMenu.count > 0 ? i18n.tr("Available networks…")
167167 : i18n.tr("No available networks.")
168168 }
qml/Wizard/Pages/40-timezone.qml+2−2
@@ -59,7 +59,7 @@ LocalComponents.Page {
5959 anchors.topMargin: units.gu(3)
6060 font.weight: tz.currentTz ? Font.Normal : Font.Light
6161 fontSize: "medium"
62− color: "black"
62+ color: "#525252"
6363 }
6464 Label {
6565 id: timeLabel
@@ -69,7 +69,7 @@ LocalComponents.Page {
6969 anchors.bottomMargin: units.gu(3)
7070 font.weight: tz.currentTz ? Font.Normal : Font.Light
7171 fontSize: "small"
72− color: "black"
72+ color: "#525252"
7373 }
7474 Image {
7575 anchors {
qml/Wizard/Pages/50-location.qml+5−5
@@ -76,7 +76,7 @@ LocalComponents.Page {
7676 }
7777
7878 wrapMode: Text.WordWrap
79− color: "black"
79+ color: "#525252"
8080 font.weight: checked ? Font.Normal : Font.Light
8181 text: i18n.tr("Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location (recommended)")
8282 property bool checked: true
@@ -101,7 +101,7 @@ LocalComponents.Page {
101101 }
102102
103103 wrapMode: Text.WordWrap
104− color: "black"
104+ color: "#525252"
105105 font.weight: Font.Light
106106 fontSize: "small"
107107 linkColor: "#dd4814"
@@ -128,7 +128,7 @@ LocalComponents.Page {
128128 }
129129 text: i18n.tr("GPS only")
130130 wrapMode: Text.WordWrap
131− color: "black"
131+ color: "#525252"
132132 font.weight: checked ? Font.Normal : Font.Light
133133 width: content.width
134134 property bool checked: false
@@ -161,7 +161,7 @@ LocalComponents.Page {
161161 rightMargin: rightMargin
162162 }
163163 wrapMode: Text.WordWrap
164− color: "black"
164+ color: "#525252"
165165 font.weight: checked ? Font.Normal : Font.Light
166166 width: content.width
167167 text: i18n.tr("Don't use my location")
@@ -196,7 +196,7 @@ LocalComponents.Page {
196196 wrapMode: Text.Wrap
197197 textFormat: Text.RichText
198198 text: i18n.tr("You can change it later in <em>System Settings</em>.")
199− color: "black"
199+ color: "#525252"
200200 fontSize: "small"
201201 font.weight: Font.Light
202202 width: content.width
qml/Wizard/Pages/70-reporting.qml+1
@@ -46,6 +46,7 @@ LocalComponents.Page {
4646 text: i18n.tr("Privacy policy")
4747 color: "#dd4814"
4848 font.weight: Font.Light
49+ fontSize: "small"
4950 MouseArea {
5051 anchors.fill: parent
5152 cursorShape: Qt.PointingHandCursor
qml/Wizard/Pages/80-finished.qml+1−2
@@ -28,8 +28,7 @@ LocalComponents.Page {
2828 Image {
2929 source: "data/Phone Splash Screen bkg.png"
3030 anchors.fill: parent
31− scale: Image.PreserveAspectCrop
32− clip: true
31+ scale: Image.PreserveAspectFit
3332 }
3433
3534 Column {
qml/Wizard/StackButton.qml+3−2
@@ -25,14 +25,15 @@ AbstractButton {
2525 property bool backArrow: false
2626
2727 width: label.width
28− height: label.height + units.gu(4)
28+ height: units.gu(5)
2929
3030 Label {
3131 id: label
3232 anchors.verticalCenter: parent.verticalCenter
3333 anchors.left: parent.left
3434 anchors.right: parent.right
35− color: enabled ? "black" : UbuntuColors.lightGrey // FIXME proper colors
35+ color: "#525252"
36+ opacity: enabled ? 1.0 : 0.5
3637 font.weight: backArrow ? Font.Normal : Font.DemiBold
3738 text: stackButton.text
3839 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight