git.iko.soy/unity8
on xenial help sign in
Clean-up conflict.
5841958Michał Karnicki
qml/Dash/CardHeader.qml+1−6
compare with xenial
unifiedsplit
@@ -93,13 +93,8 @@ Item {
93 elide: Text.ElideRight
93 elide: Text.ElideRight
94 font.weight: Font.Light
94 font.weight: Font.Light
95 visible: titleLabel.text && text
95 visible: titleLabel.text && text
96− fontSize: "x-small"
97−<<<<<<< TREE
98− color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
99−=======
100 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
101− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
97+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
102−>>>>>>> MERGE-SOURCE
103 }
98 }
104
99
105 Row {
100 Row {