on xenial help sign in
Remove fontscale
7b78ca7Andrea Cimitan
plugins/Dash/CardCreator.js−1
@@ -343,7 +343,6 @@ var kSocialAttributesRowCode = 'CardSocialAttributes { \n\
343 objectName: "socialAttributesRow"; \n\
343 objectName: "socialAttributesRow"; \n\
344 anchors { %1 } \n\
344 anchors { %1 } \n\
345 color: %2; \n\
345 color: %2; \n\
346− fontScale: root.fontScale; \n\
347 model: cardData && cardData["socialAttributes"]; \n\
346 model: cardData && cardData["socialAttributes"]; \n\
348 onClicked: root.clicked(result); \n\
347 onClicked: root.clicked(result); \n\
349 }\n';
348 }\n';
plugins/Dash/CardSocialAttributes.qml−1
@@ -26,7 +26,6 @@ Column {
26
26
27 property alias model: repeater.model
27 property alias model: repeater.model
28 property color color: theme.palette.normal.baseText
28 property color color: theme.palette.normal.baseText
29− property real fontScale: 1.0
30
29
31 signal clicked(var result)
30 signal clicked(var result)
32
31
tests/plugins/Dash/cardcreator/12.res−1
@@ -132,7 +132,6 @@ CardSocialAttributes {
132 objectName: "socialAttributesRow";
132 objectName: "socialAttributesRow";
133 anchors { top: subtitleLabel.bottom; left: parent.left; right: parent.right; topMargin: units.gu(1); }
133 anchors { top: subtitleLabel.bottom; left: parent.left; right: parent.right; topMargin: units.gu(1); }
134 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
134 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
135− fontScale: root.fontScale;
136 model: cardData && cardData["socialAttributes"];
135 model: cardData && cardData["socialAttributes"];
137 onClicked: root.clicked(result);
136 onClicked: root.clicked(result);
138}
137}