git.iko.soy/unity8
on xenial help sign in
consistent Label colors
d547fcbLukáš Tinkl
qml/Wizard/Pages/20-keyboard.qml+4
compare with xenial
unifiedsplit
@@ -75,6 +75,7 @@ LocalComponents.Page {
75 anchors.right: parent.right
75 anchors.right: parent.right
76 text: i18n.tr("Keyboard language")
76 text: i18n.tr("Keyboard language")
77 font.weight: Font.Normal
77 font.weight: Font.Normal
78+ color: textColor
78 }
79 }
79
80
80 LocalComponents.WizardItemSelector {
81 LocalComponents.WizardItemSelector {
@@ -96,6 +97,7 @@ LocalComponents.Page {
96 anchors.right: parent.right
97 anchors.right: parent.right
97 text: i18n.tr("Keyboard layout")
98 text: i18n.tr("Keyboard layout")
98 font.weight: Font.Normal
99 font.weight: Font.Normal
100+ color: textColor
99 }
101 }
100
102
101 ListView {
103 ListView {
@@ -125,7 +127,9 @@ LocalComponents.Page {
125 ListItemLayout {
127 ListItemLayout {
126 id: layout
128 id: layout
127 title.text: displayName
129 title.text: displayName
130+ title.color: textColor
128 subtitle.text: layoutId
131 subtitle.text: layoutId
132+ subtitle.color: textColor
129 padding.leading: -units.gu(1)
133 padding.leading: -units.gu(1)
130 padding.trailing: -units.gu(1)
134 padding.trailing: -units.gu(1)
131 Image {
135 Image {
qml/Wizard/WizardItemSelector.qml+1−1
@@ -88,7 +88,7 @@ Rectangle {
88
88
89 width: parent.width
89 width: parent.width
90 text: expanded ? modelData : optionToggle.model[selectedIndex]
90 text: expanded ? modelData : optionToggle.model[selectedIndex]
91− color: theme.palette.normal.backgroundSecondaryText
91+ color: textColor
92 font.weight: Font.Light
92 font.weight: Font.Light
93 maximumLineCount: 1
93 maximumLineCount: 1
94 elide: Text.ElideRight
94 elide: Text.ElideRight