on xenial help sign in
Clean-up conflict.
commit58419585072bdb1c8c078806110c50fdcfb53725 authorMichał Karnicki <michal.karnicki@canonical.com> dateFri 7 Feb 2014, 12:28 (13 years ago) parenta6ab6f4
1 file changed+1−6
qml/Dash/CardHeader.qml+1−6
qml/Dash/CardHeader.qml+1−6
@@ -93,13 +93,8 @@ Item {
9393 elide: Text.ElideRight
9494 font.weight: Font.Light
9595 visible: titleLabel.text && text
96− fontSize: "x-small"
97−<<<<<<< TREE
98− color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
99−=======
10096 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
101− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
102−>>>>>>> MERGE-SOURCE
97+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
10398 }
10499
105100 Row {