git.iko.soy/unity8
on xenial help sign in
Some tweaks to font size, plus remove margin on PreviewHeader
commita5e8f5399bd3b82ce471d4c68d72a6af6a6fb013 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 14 Oct 2016, 13:22 (10 years ago) parent03243cb
8 files changed+19−6
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewAudioPlayback.qml+2−1 qml/Dash/Previews/PreviewComment.qml+2 qml/Dash/Previews/PreviewHeader.qml+5−3 qml/Dash/Previews/PreviewIconActions.qml+1 qml/Dash/Previews/PreviewRatingInput.qml+1 qml/Dash/Previews/PreviewRatingSingleDisplay.qml+3 qml/Dash/Previews/PreviewTable.qml+2−1 qml/Dash/Previews/PreviewTextSummary.qml+3−1
qml/Dash/Previews/PreviewAudioPlayback.qml+2−1
@@ -105,7 +105,8 @@ PreviewWidget {
105105 anchors { top: parent.top; left: parent.left; right: parent.right }
106106 opacity: 0.9
107107 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
108− fontSize: "small"
108+ fontSize: "medium"
109+ font.weight: Font.Light
109110 horizontalAlignment: Text.AlignLeft
110111 text: modelData["title"]
111112 elide: Text.ElideRight
qml/Dash/Previews/PreviewComment.qml+2
@@ -70,6 +70,7 @@ PreviewWidget {
7070 visible: text !== ""
7171 text: widgetData["subtitle"] || ""
7272 fontSize: "xx-small"
73+ font.weight: Font.Light
7374 maximumLineCount: 1
7475 elide: Text.ElideRight
7576 }
@@ -77,6 +78,7 @@ PreviewWidget {
7778 width: parent.width
7879 text: widgetData["comment"] || ""
7980 fontSize: "small"
81+ font.weight: Font.Light
8082 wrapMode: Text.Wrap
8183 }
8284 }
qml/Dash/Previews/PreviewHeader.qml+5−3
@@ -60,7 +60,8 @@ PreviewWidget {
6060 anchors {
6161 top: parent.top; left: parent.left; right: parent.right
6262 margins: margins
63− leftMargin: spacing
63+ topMargin: 0
64+ leftMargin: 0
6465 rightMargin: spacing
6566 }
6667
@@ -83,6 +84,7 @@ PreviewWidget {
8384 sourceFillMode: UbuntuShape.PreserveAspectCrop
8485 sourceHorizontalAlignment: UbuntuShape.AlignHCenter
8586 sourceVerticalAlignment: UbuntuShape.AlignVCenter
87+ aspect: UbuntuShape.Flat
8688 source: Image {
8789 source: headerRoot.mascot
8890 width: source ? mascotShapeLoader.width : 0
@@ -113,8 +115,8 @@ PreviewWidget {
113115 rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0
114116 }
115117 elide: Text.ElideRight
116− font.weight: Font.Normal
117118 fontSize: "large"
119+ font.weight: Font.Light
118120 wrapMode: Text.Wrap
119121 color: headerRoot.fontColor
120122 text: headerRoot.title
@@ -145,7 +147,7 @@ PreviewWidget {
145147 id: subtitleLabel
146148 objectName: "subtitleLabel"
147149 elide: Text.ElideRight
148− fontSize: "small"
150+ fontSize: "x-small"
149151 font.weight: Font.Light
150152 color: headerRoot.fontColor
151153 text: headerRoot.subtitle
qml/Dash/Previews/PreviewIconActions.qml+1
@@ -71,6 +71,7 @@ PreviewWidget {
7171 anchors.left: icon.right
7272 anchors.leftMargin: visible ? units.gu(0.5) : 0
7373 text: modelData.label
74+ font.weight: Font.Light
7475 visible: text !== ""
7576 }
7677
qml/Dash/Previews/PreviewRatingInput.qml+1
@@ -103,6 +103,7 @@ PreviewWidget {
103103 objectName: "ratingLabel"
104104 anchors { left: parent.left; right: parent.right; }
105105 fontSize: "large"
106+ font.weight: Font.Light
106107 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
107108 opacity: .8
108109 text: widgetData["rating-label"] || i18n.tr("Rate this")
qml/Dash/Previews/PreviewRatingSingleDisplay.qml+3
@@ -47,6 +47,7 @@ Column {
4747 objectName: "authorLabel"
4848 anchors { left: parent.left; right: parent.right }
4949 opacity: .8
50+ font.size: "small"
5051 visible: text !== ""
5152 wrapMode: Text.Wrap
5253 }
@@ -57,6 +58,8 @@ Column {
5758 anchors { left: parent.left; right: parent.right }
5859 color: authorLabel.color
5960 opacity: .8
61+ font.size: "x-small"
62+ font.weight: Font.Light
6063 visible: text !== ""
6164 wrapMode: Text.Wrap
6265 }
qml/Dash/Previews/PreviewTable.qml+2−1
@@ -48,6 +48,7 @@ PreviewWidget {
4848 }
4949 height: visible ? implicitHeight : 0
5050 fontSize: "large"
51+ font.weight: Font.Light
5152 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
5253 visible: text !== ""
5354 opacity: .8
@@ -73,7 +74,7 @@ PreviewWidget {
7374 text: perRowRepeater.model[index]
7475 visible: root.expanded || rowIndex < maximumCollapsedRowCount
7576 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
76− font.bold: index == 0
77+ font.weight: index == 0 ? Font.Normal : Font.Light
7778 wrapMode: Text.Wrap
7879 Layout.alignment: Qt.AlignTop
7980 Layout.maximumWidth: column.width - x
qml/Dash/Previews/PreviewTextSummary.qml+3−1
@@ -39,6 +39,7 @@ PreviewWidget {
3939 }
4040 height: visible ? implicitHeight : 0
4141 fontSize: "large"
42+ font.weight: Font.Light
4243 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
4344 visible: text !== ""
4445 opacity: .8
@@ -59,7 +60,8 @@ PreviewWidget {
5960 }
6061 height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount
6162 clip: true
62− fontSize: "small"
63+ fontSize: "medium"
64+ font.weight: Font.Light
6365 lineHeight: 1.2
6466 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
6567 opacity: .8