git.iko.soy/unity8
on xenial help sign in
color fixes for the new UITK
95ebb9eLukáš Tinkl
qml/Wizard/Page.qml+4−4
compare with xenial
unifiedsplit
@@ -38,10 +38,10 @@ Item {
38
38
39 // colors
39 // colors
40 readonly property color backgroundColor: "#fdfdfd"
40 readonly property color backgroundColor: "#fdfdfd"
41− readonly property color dividerColor: "#cdcdcd"
41+ readonly property color dividerColor: UbuntuColors.silk
42− readonly property color textColor: "#5d5d5d"
42+ readonly property color textColor: UbuntuColors.slate
43− readonly property color errorColor: "#e14141"
43+ readonly property color errorColor: theme.palette.normal.negative
44− readonly property color okColor: "#3fb24f"
44+ readonly property color okColor: theme.palette.normal.positive
45
45
46 // If you want to skip a page, mark skipValid false while you figure out
46 // If you want to skip a page, mark skipValid false while you figure out
47 // whether to skip, then set it to true once you've determined the value
47 // whether to skip, then set it to true once you've determined the value
qml/Wizard/Pages/50-timezone.qml−1
@@ -87,7 +87,6 @@ LocalComponents.Page {
87 }
87 }
88
88
89 resetViews();
89 resetViews();
90− theme.palette.normal.backgroundText = "#cdcdcd";
91 searchField.forceActiveFocus();
90 searchField.forceActiveFocus();
92 }
91 }
93 }
92 }
qml/Wizard/Pages/60-account.qml−4
@@ -25,10 +25,6 @@ LocalComponents.Page {
25
25
26 forwardButtonSourceComponent: forwardButton
26 forwardButtonSourceComponent: forwardButton
27
27
28− Component.onCompleted: {
29− theme.palette.normal.backgroundText = "#cdcdcd";
30− }
31−
32 QtObject {
28 QtObject {
33 id: d
29 id: d
34 readonly property string validName: nameInput.text.trim()
30 readonly property string validName: nameInput.text.trim()
qml/Wizard/Pages/80-finished.qml+2
@@ -87,6 +87,7 @@ LocalComponents.Page {
87 font.weight: Font.Light
87 font.weight: Font.Light
88 lineHeight: 1.2
88 lineHeight: 1.2
89 text: i18n.tr("Welcome to Ubuntu")
89 text: i18n.tr("Welcome to Ubuntu")
90+ color: "white"
90 }
91 }
91
92
92 Label {
93 Label {
@@ -101,6 +102,7 @@ LocalComponents.Page {
101 font.weight: Font.Light
102 font.weight: Font.Light
102 lineHeight: 1.2
103 lineHeight: 1.2
103 text: i18n.tr("You are ready to use your device now")
104 text: i18n.tr("You are ready to use your device now")
105+ color: "white"
104 }
106 }
105
107
106 Rectangle {
108 Rectangle {
qml/Wizard/PasswordMeter.qml+2−2
@@ -64,9 +64,9 @@ Item {
64 else if (passwordScore > 60)
64 else if (passwordScore > 60)
65 return "#f9c00f";
65 return "#f9c00f";
66 else if (passwordScore >= 30)
66 else if (passwordScore >= 30)
67− return "#ed3146";
67+ return errorColor;
68
68
69− return "#ed3146";
69+ return errorColor;
70 }
70 }
71 visible: password.length > 0
71 visible: password.length > 0
72 }
72 }
qml/Wizard/Wizard.qml+2
@@ -47,5 +47,7 @@ Showable {
47 target: loader.item
47 target: loader.item
48 onQuit: root.hide()
48 onQuit: root.hide()
49 }
49 }
50+
51+ onLoaded: theme.name = "Ubuntu.Components.Themes.Ambiance";
50 }
52 }
51}
53}
qml/Wizard/WizardTextField.qml−4
@@ -21,9 +21,5 @@ import Ubuntu.Components.Themes.Ambiance 1.3
21TextField {
21TextField {
22 id: styledItem
22 id: styledItem
23 style: TextFieldStyle {
23 style: TextFieldStyle {
24− color: "#5d5d5d"
25− backgroundColor: (focus || highlighted) ? "#fdfdfd" : "#f5f5f5"
26− errorColor: "#e14141"
27− selectionColor: "#cdcdcd"
28 }
24 }
29}
25}