git.iko.soy/unity8
on xenial help sign in
Merge lp:~mhr3/unity8/design-tweaks .
eeb1bcfMichał Sawicz
qml/Dash/CardHeader.qml+8−2
compare with xenial
unifiedsplit
@@ -27,6 +27,7 @@ Item {
27 property alias altPrice: altPriceLabel.text
27 property alias altPrice: altPriceLabel.text
28
28
29 property alias titleWeight: titleLabel.font.weight
29 property alias titleWeight: titleLabel.font.weight
30+ property alias titleSize: titleLabel.fontSize
30
31
31 // FIXME: Saviq, used to scale fonts down in Carousel
32 // FIXME: Saviq, used to scale fonts down in Carousel
32 property real fontScale: 1.0
33 property real fontScale: 1.0
@@ -61,6 +62,7 @@ Item {
61 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
62 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
62 width: units.gu(6)
63 width: units.gu(6)
63 height: units.gu(5.625)
64 height: units.gu(5.625)
65+ anchors.verticalCenter: parent.verticalCenter
64 visible: useMascotShape && image && image.status === Image.Ready
66 visible: useMascotShape && image && image.status === Image.Ready
65 readonly property int maxSize: Math.max(width, height) * 4
67 readonly property int maxSize: Math.max(width, height) * 4
66
68
@@ -72,6 +74,7 @@ Item {
72
74
73 width: source ? mascotShape.width : 0
75 width: source ? mascotShape.width : 0
74 height: mascotShape.height
76 height: mascotShape.height
77+ anchors.verticalCenter: parent.verticalCenter
75 visible: !useMascotShape && status === Image.Ready
78 visible: !useMascotShape && status === Image.Ready
76
79
77 sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
80 sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
@@ -83,14 +86,16 @@ Item {
83 Column {
86 Column {
84 objectName: "column"
87 objectName: "column"
85 width: parent.width - x
88 width: parent.width - x
86− spacing: units.gu(0.5)
89+ spacing: units.gu(0.25)
90+ anchors.verticalCenter: parent.verticalCenter
87
91
88 Label {
92 Label {
89 id: titleLabel
93 id: titleLabel
90 objectName: "titleLabel"
94 objectName: "titleLabel"
91 anchors { left: parent.left; right: parent.right }
95 anchors { left: parent.left; right: parent.right }
92 elide: Text.ElideRight
96 elide: Text.ElideRight
93− font.weight: Font.DemiBold
97+ font.weight: Font.Normal
98+ fontSize: "small"
94 wrapMode: Text.Wrap
99 wrapMode: Text.Wrap
95 maximumLineCount: 2
100 maximumLineCount: 2
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
101 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
@@ -102,6 +107,7 @@ Item {
102 objectName: "subtitleLabel"
107 objectName: "subtitleLabel"
103 anchors { left: parent.left; right: parent.right }
108 anchors { left: parent.left; right: parent.right }
104 elide: Text.ElideRight
109 elide: Text.ElideRight
110+ fontSize: "small"
105 font.weight: Font.Light
111 font.weight: Font.Light
106 visible: titleLabel.text && text
112 visible: titleLabel.text && text
107 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
113 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
qml/Dash/Previews/PreviewActions.qml+1−1
@@ -24,7 +24,7 @@ import QtQuick 2.1
24PreviewWidget {
24PreviewWidget {
25 id: root
25 id: root
26
26
27− height: row.height
27+ height: row.height + units.gu(1)
28
28
29 Row {
29 Row {
30 id: row
30 id: row
qml/Dash/Previews/PreviewHeader.qml+3−1
@@ -34,5 +34,7 @@ PreviewWidget {
34 title: root.widgetData["title"] || ""
34 title: root.widgetData["title"] || ""
35 subtitle: root.widgetData["subtitle"] || ""
35 subtitle: root.widgetData["subtitle"] || ""
36 width: parent.width
36 width: parent.width
37+
38+ titleSize: "large"
37 }
39 }
38−}
40+}
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