git.iko.soy/unity8
on xenial help sign in
Bring things closer to design
4c40dd8Michal Hruby
qml/Dash/CardHeader.qml+3−1
compare with xenial
unifiedsplit
@@ -90,7 +90,8 @@ Item {
90 objectName: "titleLabel"
90 objectName: "titleLabel"
91 anchors { left: parent.left; right: parent.right }
91 anchors { left: parent.left; right: parent.right }
92 elide: Text.ElideRight
92 elide: Text.ElideRight
93− font.weight: Font.DemiBold
93+ font.weight: Font.Normal
94+ fontSize: "small"
94 wrapMode: Text.Wrap
95 wrapMode: Text.Wrap
95 maximumLineCount: 2
96 maximumLineCount: 2
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
@@ -102,6 +103,7 @@ Item {
102 objectName: "subtitleLabel"
103 objectName: "subtitleLabel"
103 anchors { left: parent.left; right: parent.right }
104 anchors { left: parent.left; right: parent.right }
104 elide: Text.ElideRight
105 elide: Text.ElideRight
106+ fontSize: "small"
105 font.weight: Font.Light
107 font.weight: Font.Light
106 visible: titleLabel.text && text
108 visible: titleLabel.text && text
107 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
109 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
qml/Dash/Previews/PreviewTextSummary.qml+2−1
@@ -59,7 +59,8 @@ PreviewWidget {
59 }
59 }
60 height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)
60 height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)
61 clip: true
61 clip: true
62− fontSize: "medium"
62+ fontSize: "small"
63+ lineHeight: 1.2
63 // TODO karni: Yet another fix requiring Palette update.
64 // TODO karni: Yet another fix requiring Palette update.
64 color: "grey" //Theme.palette.selected.backgroundText
65 color: "grey" //Theme.palette.selected.backgroundText
65 opacity: .8
66 opacity: .8