git.iko.soy/unity8
on xenial help sign in
Fix broken merge.
be79543Michał Sawicz
qml/Dash/CardHeader.qml−2
compare with xenial
unifiedsplit
@@ -98,7 +98,6 @@ Item {
98 fontSize: "small"
98 fontSize: "small"
99 wrapMode: Text.Wrap
99 wrapMode: Text.Wrap
100 maximumLineCount: 2
100 maximumLineCount: 2
101− fontSize: "small"
102 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
101 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
103 color: fontColor
102 color: fontColor
104 }
103 }
@@ -111,7 +110,6 @@ Item {
111 fontSize: "small"
110 fontSize: "small"
112 font.weight: Font.Light
111 font.weight: Font.Light
113 visible: titleLabel.text && text
112 visible: titleLabel.text && text
114− fontSize: "x-small"
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
113 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
116 color: fontColor
114 color: fontColor
117 }
115 }