git.iko.soy/unity8
on xenial help sign in
Fix font colors before Theme palette is updated to match new designs.
commit3f4627b49a4dc9e6ac470176298bc4a000c31433 authorMichał Karnicki <michal.karnicki@canonical.com> dateFri 7 Feb 2014, 12:10 (13 years ago) parent8e013a4
2 files changed+6−1
compare with xenial
unifiedsplit
qml/Dash/Card.qml+2 qml/Dash/CardHeader.qml+4−1
qml/Dash/Card.qml+2
@@ -81,5 +81,7 @@ AbstractButton {
8181 text: cardData && cardData["summary"] || ""
8282 height: text ? implicitHeight : 0
8383 fontSize: "small"
84+ // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
85+ color: "grey"
8486 }
8587}
qml/Dash/CardHeader.qml+4−1
@@ -71,6 +71,8 @@ Item {
7171 wrapMode: Text.Wrap
7272 maximumLineCount: 2
7373 fontSize: "small"
74+ // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
75+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
7476 }
7577
7678 Label {
@@ -81,6 +83,7 @@ Item {
8183 font.weight: Font.Light
8284 visible: titleLabel.text && text
8385 fontSize: "x-small"
86+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
8487 }
8588
8689 Row {
@@ -101,7 +104,7 @@ Item {
101104 width: parent.labelWidth
102105 elide: Text.ElideRight
103106 font.weight: Font.DemiBold
104− color: Theme.palette.selected.foreground
107+ color: "grey" // Theme.palette.normal.backgroundText
105108 visible: text
106109 }
107110