on xenial help sign in
Merge lp:~mhr3/unity8/design-tweaks .
commiteeb1bcff06f630f69b32ee8fb763cf9fd92e584f authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 21 Feb 2014, 19:02 (13 years ago) parent6954905ea5d42a
4 files changed+14−5
qml/Dash/CardHeader.qml+8−2 qml/Dash/Previews/PreviewActions.qml+1−1 qml/Dash/Previews/PreviewHeader.qml+3−1 qml/Dash/Previews/PreviewTextSummary.qml+2−1
qml/Dash/CardHeader.qml+8−2
@@ -27,6 +27,7 @@ Item {
2727 property alias altPrice: altPriceLabel.text
2828
2929 property alias titleWeight: titleLabel.font.weight
30+ property alias titleSize: titleLabel.fontSize
3031
3132 // FIXME: Saviq, used to scale fonts down in Carousel
3233 property real fontScale: 1.0
@@ -61,6 +62,7 @@ Item {
6162 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
6263 width: units.gu(6)
6364 height: units.gu(5.625)
65+ anchors.verticalCenter: parent.verticalCenter
6466 visible: useMascotShape && image && image.status === Image.Ready
6567 readonly property int maxSize: Math.max(width, height) * 4
6668
@@ -72,6 +74,7 @@ Item {
7274
7375 width: source ? mascotShape.width : 0
7476 height: mascotShape.height
77+ anchors.verticalCenter: parent.verticalCenter
7578 visible: !useMascotShape && status === Image.Ready
7679
7780 sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
@@ -83,14 +86,16 @@ Item {
8386 Column {
8487 objectName: "column"
8588 width: parent.width - x
86− spacing: units.gu(0.5)
89+ spacing: units.gu(0.25)
90+ anchors.verticalCenter: parent.verticalCenter
8791
8892 Label {
8993 id: titleLabel
9094 objectName: "titleLabel"
9195 anchors { left: parent.left; right: parent.right }
9296 elide: Text.ElideRight
93− font.weight: Font.DemiBold
97+ font.weight: Font.Normal
98+ fontSize: "small"
9499 wrapMode: Text.Wrap
95100 maximumLineCount: 2
96101 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
@@ -102,6 +107,7 @@ Item {
102107 objectName: "subtitleLabel"
103108 anchors { left: parent.left; right: parent.right }
104109 elide: Text.ElideRight
110+ fontSize: "small"
105111 font.weight: Font.Light
106112 visible: titleLabel.text && text
107113 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
qml/Dash/Previews/PreviewActions.qml+1−1
@@ -24,7 +24,7 @@ import QtQuick 2.1
2424PreviewWidget {
2525 id: root
2626
27− height: row.height
27+ height: row.height + units.gu(1)
2828
2929 Row {
3030 id: row
qml/Dash/Previews/PreviewHeader.qml+3−1
@@ -34,5 +34,7 @@ PreviewWidget {
3434 title: root.widgetData["title"] || ""
3535 subtitle: root.widgetData["subtitle"] || ""
3636 width: parent.width
37+
38+ titleSize: "large"
3739 }
38−}
40+}
qml/Dash/Previews/PreviewTextSummary.qml+2−1
@@ -59,7 +59,8 @@ PreviewWidget {
5959 }
6060 height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)
6161 clip: true
62− fontSize: "medium"
62+ fontSize: "small"
63+ lineHeight: 1.2
6364 // TODO karni: Yet another fix requiring Palette update.
6465 color: "grey" //Theme.palette.selected.backgroundText
6566 opacity: .8