git.iko.soy/unity8
on xenial help sign in
more visuals matching
305af2fLukáš Tinkl
qml/Wizard/CheckableSetting.qml+2−1
compare with xenial
unifiedsplit
@@ -78,8 +78,9 @@ ListItem.Empty {
78 }
78 }
79 wrapMode: Text.Wrap
79 wrapMode: Text.Wrap
80 linkColor: Theme.palette.normal.foregroundText
80 linkColor: Theme.palette.normal.foregroundText
81− color: "black"
81+ color: "#525252"
82 font.weight: Font.Light
82 font.weight: Font.Light
83+ fontSize: "small"
83 onLinkActivated: listItem.linkActivated(link)
84 onLinkActivated: listItem.linkActivated(link)
84 }
85 }
85 }
86 }
qml/Wizard/Page.qml+1−1
@@ -103,7 +103,7 @@ Item {
103 }
103 }
104 wrapMode: Text.Wrap
104 wrapMode: Text.Wrap
105 text: title
105 text: title
106− color: customTitle ? "black" : "white"
106+ color: customTitle ? "#525252" : "#fdfdfd"
107 fontSize: "x-large"
107 fontSize: "x-large"
108 }
108 }
109 }
109 }
qml/Wizard/Pages/10-language.qml+1−1
@@ -131,7 +131,7 @@ LocalComponents.Page {
131
131
132 fontSize: "medium"
132 fontSize: "medium"
133 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
133 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
134− color: "black" // FIXME proper color from the theme
134+ color: "#525252"
135 }
135 }
136
136
137 Image {
137 Image {
qml/Wizard/Pages/15-country.qml+1−1
@@ -127,7 +127,7 @@ LocalComponents.Page {
127
127
128 fontSize: "medium"
128 fontSize: "medium"
129 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
129 font.weight: itemDelegate.isCurrent ? Font.Normal : Font.Light
130− color: "black" // FIXME proper color from the theme
130+ color: "#525252"
131 }
131 }
132
132
133 Image {
133 Image {
qml/Wizard/Pages/20-sim.qml+2−2
@@ -77,7 +77,7 @@ LocalComponents.Page {
77 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
77 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
78 fontSize: "small"
78 fontSize: "small"
79 font.weight: Font.Light
79 font.weight: Font.Light
80− color: restartDialog.visible ? Theme.palette.normal.backgroundText : "black"
80+ color: restartDialog.visible ? Theme.palette.normal.backgroundText : "#525252"
81 }
81 }
82
82
83 Label {
83 Label {
@@ -88,7 +88,7 @@ LocalComponents.Page {
88 text: i18n.tr("To proceed with no SIM tap <em>Skip</em>.")
88 text: i18n.tr("To proceed with no SIM tap <em>Skip</em>.")
89 fontSize: "small"
89 fontSize: "small"
90 font.weight: Font.Light
90 font.weight: Font.Light
91− color: restartDialog.visible ? Theme.palette.normal.backgroundText : "black"
91+ color: restartDialog.visible ? Theme.palette.normal.backgroundText : "#525252"
92 }
92 }
93 }
93 }
94
94
qml/Wizard/Pages/30-wifi.qml+1−1
@@ -162,7 +162,7 @@ LocalComponents.Page {
162 anchors.right: parent.right
162 anchors.right: parent.right
163 fontSize: "small"
163 fontSize: "small"
164 font.weight: Font.Light
164 font.weight: Font.Light
165− color: "black"
165+ color: "#525252"
166 text: mainMenu.count > 0 ? i18n.tr("Available networks…")
166 text: mainMenu.count > 0 ? i18n.tr("Available networks…")
167 : i18n.tr("No available networks.")
167 : i18n.tr("No available networks.")
168 }
168 }
qml/Wizard/Pages/40-timezone.qml+2−2
@@ -59,7 +59,7 @@ LocalComponents.Page {
59 anchors.topMargin: units.gu(3)
59 anchors.topMargin: units.gu(3)
60 font.weight: tz.currentTz ? Font.Normal : Font.Light
60 font.weight: tz.currentTz ? Font.Normal : Font.Light
61 fontSize: "medium"
61 fontSize: "medium"
62− color: "black"
62+ color: "#525252"
63 }
63 }
64 Label {
64 Label {
65 id: timeLabel
65 id: timeLabel
@@ -69,7 +69,7 @@ LocalComponents.Page {
69 anchors.bottomMargin: units.gu(3)
69 anchors.bottomMargin: units.gu(3)
70 font.weight: tz.currentTz ? Font.Normal : Font.Light
70 font.weight: tz.currentTz ? Font.Normal : Font.Light
71 fontSize: "small"
71 fontSize: "small"
72− color: "black"
72+ color: "#525252"
73 }
73 }
74 Image {
74 Image {
75 anchors {
75 anchors {
qml/Wizard/Pages/50-location.qml+5−5
@@ -76,7 +76,7 @@ LocalComponents.Page {
76 }
76 }
77
77
78 wrapMode: Text.WordWrap
78 wrapMode: Text.WordWrap
79− color: "black"
79+ color: "#525252"
80 font.weight: checked ? Font.Normal : Font.Light
80 font.weight: checked ? Font.Normal : Font.Light
81 text: i18n.tr("Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location (recommended)")
81 text: i18n.tr("Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location (recommended)")
82 property bool checked: true
82 property bool checked: true
@@ -101,7 +101,7 @@ LocalComponents.Page {
101 }
101 }
102
102
103 wrapMode: Text.WordWrap
103 wrapMode: Text.WordWrap
104− color: "black"
104+ color: "#525252"
105 font.weight: Font.Light
105 font.weight: Font.Light
106 fontSize: "small"
106 fontSize: "small"
107 linkColor: "#dd4814"
107 linkColor: "#dd4814"
@@ -128,7 +128,7 @@ LocalComponents.Page {
128 }
128 }
129 text: i18n.tr("GPS only")
129 text: i18n.tr("GPS only")
130 wrapMode: Text.WordWrap
130 wrapMode: Text.WordWrap
131− color: "black"
131+ color: "#525252"
132 font.weight: checked ? Font.Normal : Font.Light
132 font.weight: checked ? Font.Normal : Font.Light
133 width: content.width
133 width: content.width
134 property bool checked: false
134 property bool checked: false
@@ -161,7 +161,7 @@ LocalComponents.Page {
161 rightMargin: rightMargin
161 rightMargin: rightMargin
162 }
162 }
163 wrapMode: Text.WordWrap
163 wrapMode: Text.WordWrap
164− color: "black"
164+ color: "#525252"
165 font.weight: checked ? Font.Normal : Font.Light
165 font.weight: checked ? Font.Normal : Font.Light
166 width: content.width
166 width: content.width
167 text: i18n.tr("Don't use my location")
167 text: i18n.tr("Don't use my location")
@@ -196,7 +196,7 @@ LocalComponents.Page {
196 wrapMode: Text.Wrap
196 wrapMode: Text.Wrap
197 textFormat: Text.RichText
197 textFormat: Text.RichText
198 text: i18n.tr("You can change it later in <em>System Settings</em>.")
198 text: i18n.tr("You can change it later in <em>System Settings</em>.")
199− color: "black"
199+ color: "#525252"
200 fontSize: "small"
200 fontSize: "small"
201 font.weight: Font.Light
201 font.weight: Font.Light
202 width: content.width
202 width: content.width
qml/Wizard/Pages/70-reporting.qml+1
@@ -46,6 +46,7 @@ LocalComponents.Page {
46 text: i18n.tr("Privacy policy")
46 text: i18n.tr("Privacy policy")
47 color: "#dd4814"
47 color: "#dd4814"
48 font.weight: Font.Light
48 font.weight: Font.Light
49+ fontSize: "small"
49 MouseArea {
50 MouseArea {
50 anchors.fill: parent
51 anchors.fill: parent
51 cursorShape: Qt.PointingHandCursor
52 cursorShape: Qt.PointingHandCursor
qml/Wizard/Pages/80-finished.qml+1−2
@@ -28,8 +28,7 @@ LocalComponents.Page {
28 Image {
28 Image {
29 source: "data/Phone Splash Screen bkg.png"
29 source: "data/Phone Splash Screen bkg.png"
30 anchors.fill: parent
30 anchors.fill: parent
31− scale: Image.PreserveAspectCrop
31+ scale: Image.PreserveAspectFit
32− clip: true
33 }
32 }
34
33
35 Column {
34 Column {
qml/Wizard/StackButton.qml+3−2
@@ -25,14 +25,15 @@ AbstractButton {
25 property bool backArrow: false
25 property bool backArrow: false
26
26
27 width: label.width
27 width: label.width
28− height: label.height + units.gu(4)
28+ height: units.gu(5)
29
29
30 Label {
30 Label {
31 id: label
31 id: label
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: enabled ? "black" : UbuntuColors.lightGrey // FIXME proper colors
35+ color: "#525252"
36+ opacity: enabled ? 1.0 : 0.5
36 font.weight: backArrow ? Font.Normal : Font.DemiBold
37 font.weight: backArrow ? Font.Normal : Font.DemiBold
37 text: stackButton.text
38 text: stackButton.text
38 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
39 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight