git.iko.soy/unity8
on xenial help sign in
color fixes for the new UITK
commit95ebb9ede562d6a66576d8b71d2a7e4249c24da5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 9 Mar 2016, 21:42 (11 years ago) parent18c638e
7 files changed+10−15
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+4−4 qml/Wizard/Pages/50-timezone.qml−1 qml/Wizard/Pages/60-account.qml−4 qml/Wizard/Pages/80-finished.qml+2 qml/Wizard/PasswordMeter.qml+2−2 qml/Wizard/Wizard.qml+2 qml/Wizard/WizardTextField.qml−4
qml/Wizard/Page.qml+4−4
@@ -38,10 +38,10 @@ Item {
3838
3939 // colors
4040 readonly property color backgroundColor: "#fdfdfd"
41− readonly property color dividerColor: "#cdcdcd"
42− readonly property color textColor: "#5d5d5d"
43− readonly property color errorColor: "#e14141"
44− readonly property color okColor: "#3fb24f"
41+ readonly property color dividerColor: UbuntuColors.silk
42+ readonly property color textColor: UbuntuColors.slate
43+ readonly property color errorColor: theme.palette.normal.negative
44+ readonly property color okColor: theme.palette.normal.positive
4545
4646 // If you want to skip a page, mark skipValid false while you figure out
4747 // 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 {
8787 }
8888
8989 resetViews();
90− theme.palette.normal.backgroundText = "#cdcdcd";
9190 searchField.forceActiveFocus();
9291 }
9392 }
qml/Wizard/Pages/60-account.qml−4
@@ -25,10 +25,6 @@ LocalComponents.Page {
2525
2626 forwardButtonSourceComponent: forwardButton
2727
28− Component.onCompleted: {
29− theme.palette.normal.backgroundText = "#cdcdcd";
30− }
31−
3228 QtObject {
3329 id: d
3430 readonly property string validName: nameInput.text.trim()
qml/Wizard/Pages/80-finished.qml+2
@@ -87,6 +87,7 @@ LocalComponents.Page {
8787 font.weight: Font.Light
8888 lineHeight: 1.2
8989 text: i18n.tr("Welcome to Ubuntu")
90+ color: "white"
9091 }
9192
9293 Label {
@@ -101,6 +102,7 @@ LocalComponents.Page {
101102 font.weight: Font.Light
102103 lineHeight: 1.2
103104 text: i18n.tr("You are ready to use your device now")
105+ color: "white"
104106 }
105107
106108 Rectangle {
qml/Wizard/PasswordMeter.qml+2−2
@@ -64,9 +64,9 @@ Item {
6464 else if (passwordScore > 60)
6565 return "#f9c00f";
6666 else if (passwordScore >= 30)
67− return "#ed3146";
67+ return errorColor;
6868
69− return "#ed3146";
69+ return errorColor;
7070 }
7171 visible: password.length > 0
7272 }
qml/Wizard/Wizard.qml+2
@@ -47,5 +47,7 @@ Showable {
4747 target: loader.item
4848 onQuit: root.hide()
4949 }
50+
51+ onLoaded: theme.name = "Ubuntu.Components.Themes.Ambiance";
5052 }
5153}
qml/Wizard/WizardTextField.qml−4
@@ -21,9 +21,5 @@ import Ubuntu.Components.Themes.Ambiance 1.3
2121TextField {
2222 id: styledItem
2323 style: TextFieldStyle {
24− color: "#5d5d5d"
25− backgroundColor: (focus || highlighted) ? "#fdfdfd" : "#f5f5f5"
26− errorColor: "#e14141"
27− selectionColor: "#cdcdcd"
2824 }
2925}