git.iko.soy/unity8
on xenial help sign in
Updates to card font style
aa52573Andrea Cimitan
plugins/Dash/CardAttributes.qml+1−1
compare with xenial
unifiedsplit
@@ -62,7 +62,7 @@ GridLayout {
62 elide: Text.ElideRight
62 elide: Text.ElideRight
63 maximumLineCount: 1
63 maximumLineCount: 1
64 font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
64 font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
65− fontSize: "small"
65+ fontSize: "x-small"
66 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
66 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
67 color: grid.color
67 color: grid.color
68 }
68 }
plugins/Dash/CardCreator.js+3−2
@@ -308,7 +308,7 @@ var kTitleLabelCode = 'Label { \n\
308 visible: showHeader %3; \n\
308 visible: showHeader %3; \n\
309 width: %4; \n\
309 width: %4; \n\
310 text: root.title; \n\
310 text: root.title; \n\
311− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
311+ font.weight: Font.Normal; \n\
312 horizontalAlignment: %5; \n\
312 horizontalAlignment: %5; \n\
313 }\n';
313 }\n';
314
314
@@ -399,7 +399,8 @@ var kSummaryLabelCode = 'Label { \n\
399 elide: Text.ElideRight; \n\
399 elide: Text.ElideRight; \n\
400 text: cardData && cardData["summary"] || ""; \n\
400 text: cardData && cardData["summary"] || ""; \n\
401 height: text ? implicitHeight : 0; \n\
401 height: text ? implicitHeight : 0; \n\
402− fontSize: "small"; \n\
402+ fontSize: "x-small"; \n\
403+ font.weight: Font.Light; \n\
403 color: %3; \n\
404 color: %3; \n\
404 }\n';
405 }\n';
405
406
tests/plugins/Dash/cardcreator/1.res+1−1
@@ -65,7 +65,7 @@ Label {
65 visible: showHeader ;
65 visible: showHeader ;
66 width: undefined;
66 width: undefined;
67 text: root.title;
67 text: root.title;
68− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
68+ font.weight: Font.Normal;
69 horizontalAlignment: Text.AlignHCenter;
69 horizontalAlignment: Text.AlignHCenter;
70 }
70 }
71Loader {
71Loader {
tests/plugins/Dash/cardcreator/1.res.cardcreator+1−1
@@ -62,7 +62,7 @@ Label {
62 visible: showHeader ;
62 visible: showHeader ;
63 width: undefined;
63 width: undefined;
64 text: root.title;
64 text: root.title;
65− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
65+ font.weight: Font.Normal;
66 horizontalAlignment: Text.AlignHCenter;
66 horizontalAlignment: Text.AlignHCenter;
67 }
67 }
68implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
68implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
tests/plugins/Dash/cardcreator/10.res+1−1
@@ -98,7 +98,7 @@ left: parent.left;
98 visible: showHeader ;
98 visible: showHeader ;
99 width: undefined;
99 width: undefined;
100 text: root.title;
100 text: root.title;
101− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
101+ font.weight: Font.Normal;
102 horizontalAlignment: Text.AlignLeft;
102 horizontalAlignment: Text.AlignLeft;
103 }
103 }
104,Label {
104,Label {
tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1
@@ -96,7 +96,7 @@ left: parent.left;
96 visible: showHeader ;
96 visible: showHeader ;
97 width: undefined;
97 width: undefined;
98 text: root.title;
98 text: root.title;
99− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
99+ font.weight: Font.Normal;
100 horizontalAlignment: Text.AlignLeft;
100 horizontalAlignment: Text.AlignLeft;
101 }
101 }
102,Label {
102,Label {
tests/plugins/Dash/cardcreator/11.res+1−1
@@ -135,7 +135,7 @@ left: parent.left;
135 visible: showHeader ;
135 visible: showHeader ;
136 width: undefined;
136 width: undefined;
137 text: root.title;
137 text: root.title;
138− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
138+ font.weight: Font.Normal;
139 horizontalAlignment: Text.AlignLeft;
139 horizontalAlignment: Text.AlignLeft;
140 }
140 }
141,Label {
141,Label {
tests/plugins/Dash/cardcreator/11.res.cardcreator+1−1
@@ -129,7 +129,7 @@ left: parent.left;
129 visible: showHeader ;
129 visible: showHeader ;
130 width: undefined;
130 width: undefined;
131 text: root.title;
131 text: root.title;
132− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
132+ font.weight: Font.Normal;
133 horizontalAlignment: Text.AlignLeft;
133 horizontalAlignment: Text.AlignLeft;
134 }
134 }
135,Label {
135,Label {
tests/plugins/Dash/cardcreator/12.res+1−1
@@ -65,7 +65,7 @@ Label {
65 visible: showHeader ;
65 visible: showHeader ;
66 width: undefined;
66 width: undefined;
67 text: root.title;
67 text: root.title;
68− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
68+ font.weight: Font.Normal;
69 horizontalAlignment: Text.AlignLeft;
69 horizontalAlignment: Text.AlignLeft;
70 }
70 }
71Label {
71Label {
tests/plugins/Dash/cardcreator/12.res.cardcreator+1−1
@@ -62,7 +62,7 @@ Label {
62 visible: showHeader ;
62 visible: showHeader ;
63 width: undefined;
63 width: undefined;
64 text: root.title;
64 text: root.title;
65− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
65+ font.weight: Font.Normal;
66 horizontalAlignment: Text.AlignLeft;
66 horizontalAlignment: Text.AlignLeft;
67 }
67 }
68Label {
68Label {
tests/plugins/Dash/cardcreator/2.res+1−1
@@ -97,7 +97,7 @@ CroppedImageMinimumSourceSize {
97 visible: showHeader ;
97 visible: showHeader ;
98 width: undefined;
98 width: undefined;
99 text: root.title;
99 text: root.title;
100− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
100+ font.weight: Font.Normal;
101 horizontalAlignment: Text.AlignLeft;
101 horizontalAlignment: Text.AlignLeft;
102 }
102 }
103 ,Label {
103 ,Label {
tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1
@@ -95,7 +95,7 @@ CroppedImageMinimumSourceSize {
95 visible: showHeader ;
95 visible: showHeader ;
96 width: undefined;
96 width: undefined;
97 text: root.title;
97 text: root.title;
98− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
98+ font.weight: Font.Normal;
99 horizontalAlignment: Text.AlignLeft;
99 horizontalAlignment: Text.AlignLeft;
100 }
100 }
101 ,Label {
101 ,Label {
tests/plugins/Dash/cardcreator/3.res+1−1
@@ -65,7 +65,7 @@ Label {
65 visible: showHeader ;
65 visible: showHeader ;
66 width: undefined;
66 width: undefined;
67 text: root.title;
67 text: root.title;
68− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
68+ font.weight: Font.Normal;
69 horizontalAlignment: Text.AlignLeft;
69 horizontalAlignment: Text.AlignLeft;
70 }
70 }
71Label {
71Label {
tests/plugins/Dash/cardcreator/3.res.cardcreator+1−1
@@ -61,7 +61,7 @@ Label {
61 visible: showHeader ;
61 visible: showHeader ;
62 width: undefined;
62 width: undefined;
63 text: root.title;
63 text: root.title;
64− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
64+ font.weight: Font.Normal;
65 horizontalAlignment: Text.AlignLeft;
65 horizontalAlignment: Text.AlignLeft;
66 }
66 }
67Label {
67Label {
tests/plugins/Dash/cardcreator/4.res+1−1
@@ -72,7 +72,7 @@ Label {
72 visible: showHeader ;
72 visible: showHeader ;
73 width: undefined;
73 width: undefined;
74 text: root.title;
74 text: root.title;
75− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
75+ font.weight: Font.Normal;
76 horizontalAlignment: Text.AlignLeft;
76 horizontalAlignment: Text.AlignLeft;
77 }
77 }
78,Label {
78,Label {
tests/plugins/Dash/cardcreator/4.res.cardcreator+1−1
@@ -70,7 +70,7 @@ Label {
70 visible: showHeader ;
70 visible: showHeader ;
71 width: undefined;
71 width: undefined;
72 text: root.title;
72 text: root.title;
73− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
73+ font.weight: Font.Normal;
74 horizontalAlignment: Text.AlignLeft;
74 horizontalAlignment: Text.AlignLeft;
75 }
75 }
76,Label {
76,Label {
tests/plugins/Dash/cardcreator/5.res+1−1
@@ -76,7 +76,7 @@ Label {
76 visible: showHeader && overlayLoader.active;
76 visible: showHeader && overlayLoader.active;
77 width: undefined;
77 width: undefined;
78 text: root.title;
78 text: root.title;
79− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
79+ font.weight: Font.Normal;
80 horizontalAlignment: Text.AlignLeft;
80 horizontalAlignment: Text.AlignLeft;
81 }
81 }
82Label {
82Label {
tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1
@@ -73,7 +73,7 @@ Label {
73 visible: showHeader && overlayLoader.active;
73 visible: showHeader && overlayLoader.active;
74 width: undefined;
74 width: undefined;
75 text: root.title;
75 text: root.title;
76− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
76+ font.weight: Font.Normal;
77 horizontalAlignment: Text.AlignLeft;
77 horizontalAlignment: Text.AlignLeft;
78 }
78 }
79Label {
79Label {
tests/plugins/Dash/cardcreator/6.res+1−1
@@ -76,7 +76,7 @@ Item {
76 visible: showHeader ;
76 visible: showHeader ;
77 width: undefined;
77 width: undefined;
78 text: root.title;
78 text: root.title;
79− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
79+ font.weight: Font.Normal;
80 horizontalAlignment: Text.AlignLeft;
80 horizontalAlignment: Text.AlignLeft;
81 }
81 }
82,Label {
82,Label {
tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1
@@ -75,7 +75,7 @@ Item {
75 visible: showHeader ;
75 visible: showHeader ;
76 width: undefined;
76 width: undefined;
77 text: root.title;
77 text: root.title;
78− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
78+ font.weight: Font.Normal;
79 horizontalAlignment: Text.AlignLeft;
79 horizontalAlignment: Text.AlignLeft;
80 }
80 }
81,Label {
81,Label {
tests/plugins/Dash/cardcreator/7.res+1−1
@@ -98,7 +98,7 @@ CroppedImageMinimumSourceSize {
98 visible: showHeader ;
98 visible: showHeader ;
99 width: undefined;
99 width: undefined;
100 text: root.title;
100 text: root.title;
101− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
101+ font.weight: Font.Normal;
102 horizontalAlignment: Text.AlignLeft;
102 horizontalAlignment: Text.AlignLeft;
103 }
103 }
104,Label {
104,Label {
tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1
@@ -96,7 +96,7 @@ CroppedImageMinimumSourceSize {
96 visible: showHeader ;
96 visible: showHeader ;
97 width: undefined;
97 width: undefined;
98 text: root.title;
98 text: root.title;
99− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
99+ font.weight: Font.Normal;
100 horizontalAlignment: Text.AlignLeft;
100 horizontalAlignment: Text.AlignLeft;
101 }
101 }
102,Label {
102,Label {
tests/plugins/Dash/cardcreator/8.res+1−1
@@ -89,7 +89,7 @@ left: parent.left;
89 visible: showHeader ;
89 visible: showHeader ;
90 width: parent.width - x;
90 width: parent.width - x;
91 text: root.title;
91 text: root.title;
92− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
92+ font.weight: Font.Normal;
93 horizontalAlignment: Text.AlignLeft;
93 horizontalAlignment: Text.AlignLeft;
94 }
94 }
95
95
tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1
@@ -87,7 +87,7 @@ left: parent.left;
87 visible: showHeader ;
87 visible: showHeader ;
88 width: parent.width - x;
88 width: parent.width - x;
89 text: root.title;
89 text: root.title;
90− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
90+ font.weight: Font.Normal;
91 horizontalAlignment: Text.AlignLeft;
91 horizontalAlignment: Text.AlignLeft;
92 }
92 }
93
93
tests/plugins/Dash/cardcreator/9.res+1−1
@@ -31,7 +31,7 @@ top: parent.top;
31 visible: showHeader ;
31 visible: showHeader ;
32 width: undefined;
32 width: undefined;
33 text: root.title;
33 text: root.title;
34− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
34+ font.weight: Font.Normal;
35 horizontalAlignment: Text.AlignLeft;
35 horizontalAlignment: Text.AlignLeft;
36 }
36 }
37Label {
37Label {
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1
@@ -30,7 +30,7 @@ top: parent.top;
30 visible: showHeader ;
30 visible: showHeader ;
31 width: undefined;
31 width: undefined;
32 text: root.title;
32 text: root.title;
33− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
33+ font.weight: Font.Normal;
34 horizontalAlignment: Text.AlignLeft;
34 horizontalAlignment: Text.AlignLeft;
35 }
35 }
36Label {
36Label {