Updates to card font style
commitaa52573ef6fec9f03645db65b4d8126c8c827329
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateWed 5 Oct 2016, 11:58 (10 years ago)
parentdfe21d6
plugins/Dash/CardAttributes.qml+1−1
@@ -62,7 +62,7 @@ GridLayout {
6262 elide: Text.ElideRight
6363 maximumLineCount: 1
6464 font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
65− fontSize: "small"
65+ fontSize: "x-small"
6666 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
6767 color: grid.color
6868 }
plugins/Dash/CardCreator.js+3−2
@@ -308,7 +308,7 @@ var kTitleLabelCode = 'Label { \n\
308308 visible: showHeader %3; \n\
309309 width: %4; \n\
310310 text: root.title; \n\
311− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
311+ font.weight: Font.Normal; \n\
312312 horizontalAlignment: %5; \n\
313313 }\n';
314314
@@ -399,7 +399,8 @@ var kSummaryLabelCode = 'Label { \n\
399399 elide: Text.ElideRight; \n\
400400 text: cardData && cardData["summary"] || ""; \n\
401401 height: text ? implicitHeight : 0; \n\
402− fontSize: "small"; \n\
402+ fontSize: "x-small"; \n\
403+ font.weight: Font.Light; \n\
403404 color: %3; \n\
404405 }\n';
405406
tests/plugins/Dash/cardcreator/1.res+1−1
@@ -65,7 +65,7 @@ Label {
6565 visible: showHeader ;
6666 width: undefined;
6767 text: root.title;
68− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
68+ font.weight: Font.Normal;
6969 horizontalAlignment: Text.AlignHCenter;
7070 }
7171Loader {
tests/plugins/Dash/cardcreator/1.res.cardcreator+1−1
@@ -62,7 +62,7 @@ Label {
6262 visible: showHeader ;
6363 width: undefined;
6464 text: root.title;
65− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
65+ font.weight: Font.Normal;
6666 horizontalAlignment: Text.AlignHCenter;
6767 }
6868implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
tests/plugins/Dash/cardcreator/10.res+1−1
@@ -98,7 +98,7 @@ left: parent.left;
9898 visible: showHeader ;
9999 width: undefined;
100100 text: root.title;
101− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
101+ font.weight: Font.Normal;
102102 horizontalAlignment: Text.AlignLeft;
103103 }
104104,Label {
tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1
@@ -96,7 +96,7 @@ left: parent.left;
9696 visible: showHeader ;
9797 width: undefined;
9898 text: root.title;
99− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
99+ font.weight: Font.Normal;
100100 horizontalAlignment: Text.AlignLeft;
101101 }
102102,Label {
tests/plugins/Dash/cardcreator/11.res+1−1
@@ -135,7 +135,7 @@ left: parent.left;
135135 visible: showHeader ;
136136 width: undefined;
137137 text: root.title;
138− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
138+ font.weight: Font.Normal;
139139 horizontalAlignment: Text.AlignLeft;
140140 }
141141,Label {
tests/plugins/Dash/cardcreator/11.res.cardcreator+1−1
@@ -129,7 +129,7 @@ left: parent.left;
129129 visible: showHeader ;
130130 width: undefined;
131131 text: root.title;
132− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
132+ font.weight: Font.Normal;
133133 horizontalAlignment: Text.AlignLeft;
134134 }
135135,Label {
tests/plugins/Dash/cardcreator/12.res+1−1
@@ -65,7 +65,7 @@ Label {
6565 visible: showHeader ;
6666 width: undefined;
6767 text: root.title;
68− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
68+ font.weight: Font.Normal;
6969 horizontalAlignment: Text.AlignLeft;
7070 }
7171Label {
tests/plugins/Dash/cardcreator/12.res.cardcreator+1−1
@@ -62,7 +62,7 @@ Label {
6262 visible: showHeader ;
6363 width: undefined;
6464 text: root.title;
65− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
65+ font.weight: Font.Normal;
6666 horizontalAlignment: Text.AlignLeft;
6767 }
6868Label {
tests/plugins/Dash/cardcreator/2.res+1−1
@@ -97,7 +97,7 @@ CroppedImageMinimumSourceSize {
9797 visible: showHeader ;
9898 width: undefined;
9999 text: root.title;
100− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
100+ font.weight: Font.Normal;
101101 horizontalAlignment: Text.AlignLeft;
102102 }
103103 ,Label {
tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1
@@ -95,7 +95,7 @@ CroppedImageMinimumSourceSize {
9595 visible: showHeader ;
9696 width: undefined;
9797 text: root.title;
98− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
98+ font.weight: Font.Normal;
9999 horizontalAlignment: Text.AlignLeft;
100100 }
101101 ,Label {
tests/plugins/Dash/cardcreator/3.res+1−1
@@ -65,7 +65,7 @@ Label {
6565 visible: showHeader ;
6666 width: undefined;
6767 text: root.title;
68− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
68+ font.weight: Font.Normal;
6969 horizontalAlignment: Text.AlignLeft;
7070 }
7171Label {
tests/plugins/Dash/cardcreator/3.res.cardcreator+1−1
@@ -61,7 +61,7 @@ Label {
6161 visible: showHeader ;
6262 width: undefined;
6363 text: root.title;
64− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
64+ font.weight: Font.Normal;
6565 horizontalAlignment: Text.AlignLeft;
6666 }
6767Label {
tests/plugins/Dash/cardcreator/4.res+1−1
@@ -72,7 +72,7 @@ Label {
7272 visible: showHeader ;
7373 width: undefined;
7474 text: root.title;
75− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
75+ font.weight: Font.Normal;
7676 horizontalAlignment: Text.AlignLeft;
7777 }
7878,Label {
tests/plugins/Dash/cardcreator/4.res.cardcreator+1−1
@@ -70,7 +70,7 @@ Label {
7070 visible: showHeader ;
7171 width: undefined;
7272 text: root.title;
73− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
73+ font.weight: Font.Normal;
7474 horizontalAlignment: Text.AlignLeft;
7575 }
7676,Label {
tests/plugins/Dash/cardcreator/5.res+1−1
@@ -76,7 +76,7 @@ Label {
7676 visible: showHeader && overlayLoader.active;
7777 width: undefined;
7878 text: root.title;
79− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
79+ font.weight: Font.Normal;
8080 horizontalAlignment: Text.AlignLeft;
8181 }
8282Label {
tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1
@@ -73,7 +73,7 @@ Label {
7373 visible: showHeader && overlayLoader.active;
7474 width: undefined;
7575 text: root.title;
76− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
76+ font.weight: Font.Normal;
7777 horizontalAlignment: Text.AlignLeft;
7878 }
7979Label {
tests/plugins/Dash/cardcreator/6.res+1−1
@@ -76,7 +76,7 @@ Item {
7676 visible: showHeader ;
7777 width: undefined;
7878 text: root.title;
79− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
79+ font.weight: Font.Normal;
8080 horizontalAlignment: Text.AlignLeft;
8181 }
8282,Label {
tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1
@@ -75,7 +75,7 @@ Item {
7575 visible: showHeader ;
7676 width: undefined;
7777 text: root.title;
78− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
78+ font.weight: Font.Normal;
7979 horizontalAlignment: Text.AlignLeft;
8080 }
8181,Label {
tests/plugins/Dash/cardcreator/7.res+1−1
@@ -98,7 +98,7 @@ CroppedImageMinimumSourceSize {
9898 visible: showHeader ;
9999 width: undefined;
100100 text: root.title;
101− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
101+ font.weight: Font.Normal;
102102 horizontalAlignment: Text.AlignLeft;
103103 }
104104,Label {
tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1
@@ -96,7 +96,7 @@ CroppedImageMinimumSourceSize {
9696 visible: showHeader ;
9797 width: undefined;
9898 text: root.title;
99− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
99+ font.weight: Font.Normal;
100100 horizontalAlignment: Text.AlignLeft;
101101 }
102102,Label {
tests/plugins/Dash/cardcreator/8.res+1−1
@@ -89,7 +89,7 @@ left: parent.left;
8989 visible: showHeader ;
9090 width: parent.width - x;
9191 text: root.title;
92− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
92+ font.weight: Font.Normal;
9393 horizontalAlignment: Text.AlignLeft;
9494 }
9595
tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1
@@ -87,7 +87,7 @@ left: parent.left;
8787 visible: showHeader ;
8888 width: parent.width - x;
8989 text: root.title;
90− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
90+ font.weight: Font.Normal;
9191 horizontalAlignment: Text.AlignLeft;
9292 }
9393
tests/plugins/Dash/cardcreator/9.res+1−1
@@ -31,7 +31,7 @@ top: parent.top;
3131 visible: showHeader ;
3232 width: undefined;
3333 text: root.title;
34− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
34+ font.weight: Font.Normal;
3535 horizontalAlignment: Text.AlignLeft;
3636 }
3737Label {
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1
@@ -30,7 +30,7 @@ top: parent.top;
3030 visible: showHeader ;
3131 width: undefined;
3232 text: root.title;
33− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
33+ font.weight: Font.Normal;
3434 horizontalAlignment: Text.AlignLeft;
3535 }
3636Label {