a5e8f53 · unity8 · git.iko.soy

qml/Dash/Previews/PreviewAudioPlayback.qml+2−1

compare with xenial

unifiedsplit

@@ -105,7 +105,8 @@ PreviewWidget {

105 anchors { top: parent.top; left: parent.left; right: parent.right }

106 opacity: 0.9

107 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

108− fontSize: "small"

108+ fontSize: "medium"

109+ font.weight: Font.Light

109 horizontalAlignment: Text.AlignLeft

110 horizontalAlignment: Text.AlignLeft

110 text: modelData["title"]

111 text: modelData["title"]

111 elide: Text.ElideRight

112 elide: Text.ElideRight

qml/Dash/Previews/PreviewComment.qml+2

@@ -70,6 +70,7 @@ PreviewWidget {

70 visible: text !== ""

71 text: widgetData["subtitle"] || ""

72 fontSize: "xx-small"

73+ font.weight: Font.Light

73 maximumLineCount: 1

74 maximumLineCount: 1

74 elide: Text.ElideRight

75 elide: Text.ElideRight

75 }

76 }

@@ -77,6 +78,7 @@ PreviewWidget {

77 width: parent.width

78 width: parent.width

78 text: widgetData["comment"] || ""

79 text: widgetData["comment"] || ""

79 fontSize: "small"

80 fontSize: "small"

81+ font.weight: Font.Light

80 wrapMode: Text.Wrap

82 wrapMode: Text.Wrap

81 }

83 }

82 }

84 }

qml/Dash/Previews/PreviewHeader.qml+5−3

@@ -60,7 +60,8 @@ PreviewWidget {

60 anchors {

61 top: parent.top; left: parent.left; right: parent.right

62 margins: margins

63+ topMargin: 0

63− leftMargin: spacing

64+ leftMargin: 0

64 rightMargin: spacing

65 rightMargin: spacing

65 }

66 }

66

67

@@ -83,6 +84,7 @@ PreviewWidget {

83 sourceFillMode: UbuntuShape.PreserveAspectCrop

84 sourceFillMode: UbuntuShape.PreserveAspectCrop

84 sourceHorizontalAlignment: UbuntuShape.AlignHCenter

85 sourceHorizontalAlignment: UbuntuShape.AlignHCenter

85 sourceVerticalAlignment: UbuntuShape.AlignVCenter

86 sourceVerticalAlignment: UbuntuShape.AlignVCenter

87+ aspect: UbuntuShape.Flat

86 source: Image {

88 source: Image {

87 source: headerRoot.mascot

89 source: headerRoot.mascot

88 width: source ? mascotShapeLoader.width : 0

90 width: source ? mascotShapeLoader.width : 0

@@ -113,8 +115,8 @@ PreviewWidget {

113 rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0

115 rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0

114 }

116 }

115 elide: Text.ElideRight

117 elide: Text.ElideRight

116− font.weight: Font.Normal

117 fontSize: "large"

118 fontSize: "large"

119+ font.weight: Font.Light

118 wrapMode: Text.Wrap

120 wrapMode: Text.Wrap

119 color: headerRoot.fontColor

121 color: headerRoot.fontColor

120 text: headerRoot.title

122 text: headerRoot.title

@@ -145,7 +147,7 @@ PreviewWidget {

145 id: subtitleLabel

147 id: subtitleLabel

146 objectName: "subtitleLabel"

148 objectName: "subtitleLabel"

147 elide: Text.ElideRight

149 elide: Text.ElideRight

148− fontSize: "small"

150+ fontSize: "x-small"

149 font.weight: Font.Light

151 font.weight: Font.Light

150 color: headerRoot.fontColor

152 color: headerRoot.fontColor

151 text: headerRoot.subtitle

153 text: headerRoot.subtitle

qml/Dash/Previews/PreviewIconActions.qml+1

@@ -71,6 +71,7 @@ PreviewWidget {

71 anchors.left: icon.right

72 anchors.leftMargin: visible ? units.gu(0.5) : 0

73 text: modelData.label

74+ font.weight: Font.Light

74 visible: text !== ""

75 visible: text !== ""

75 }

76 }

76

77

qml/Dash/Previews/PreviewRatingInput.qml+1

@@ -103,6 +103,7 @@ PreviewWidget {

103 objectName: "ratingLabel"

104 anchors { left: parent.left; right: parent.right; }

105 fontSize: "large"

106+ font.weight: Font.Light

106 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

107 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

107 opacity: .8

108 opacity: .8

108 text: widgetData["rating-label"] || i18n.tr("Rate this")

109 text: widgetData["rating-label"] || i18n.tr("Rate this")

qml/Dash/Previews/PreviewRatingSingleDisplay.qml+3

@@ -47,6 +47,7 @@ Column {

47 objectName: "authorLabel"

48 anchors { left: parent.left; right: parent.right }

49 opacity: .8

50+ font.size: "small"

50 visible: text !== ""

51 visible: text !== ""

51 wrapMode: Text.Wrap

52 wrapMode: Text.Wrap

52 }

53 }

@@ -57,6 +58,8 @@ Column {

57 anchors { left: parent.left; right: parent.right }

58 anchors { left: parent.left; right: parent.right }

58 color: authorLabel.color

59 color: authorLabel.color

59 opacity: .8

60 opacity: .8

61+ font.size: "x-small"

62+ font.weight: Font.Light

60 visible: text !== ""

63 visible: text !== ""

61 wrapMode: Text.Wrap

64 wrapMode: Text.Wrap

62 }

65 }

qml/Dash/Previews/PreviewTable.qml+2−1

@@ -48,6 +48,7 @@ PreviewWidget {

48 }

49 height: visible ? implicitHeight : 0

50 fontSize: "large"

51+ font.weight: Font.Light

51 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

52 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

52 visible: text !== ""

53 visible: text !== ""

53 opacity: .8

54 opacity: .8

@@ -73,7 +74,7 @@ PreviewWidget {

73 text: perRowRepeater.model[index]

74 text: perRowRepeater.model[index]

74 visible: root.expanded || rowIndex < maximumCollapsedRowCount

75 visible: root.expanded || rowIndex < maximumCollapsedRowCount

75 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

76 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

76− font.bold: index == 0

77+ font.weight: index == 0 ? Font.Normal : Font.Light

77 wrapMode: Text.Wrap

78 wrapMode: Text.Wrap

78 Layout.alignment: Qt.AlignTop

79 Layout.alignment: Qt.AlignTop

79 Layout.maximumWidth: column.width - x

80 Layout.maximumWidth: column.width - x

qml/Dash/Previews/PreviewTextSummary.qml+3−1

@@ -39,6 +39,7 @@ PreviewWidget {

39 }

40 height: visible ? implicitHeight : 0

41 fontSize: "large"

42+ font.weight: Font.Light

42 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

43 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

43 visible: text !== ""

44 visible: text !== ""

44 opacity: .8

45 opacity: .8

@@ -59,7 +60,8 @@ PreviewWidget {

59 }

60 }

60 height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount

61 height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount

61 clip: true

62 clip: true

62− fontSize: "small"

63+ fontSize: "medium"

64+ font.weight: Font.Light

63 lineHeight: 1.2

65 lineHeight: 1.2

64 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

66 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

65 opacity: .8

67 opacity: .8