← Back to branch summary

~mterry/unity8/notify-authenticated

« back to all changes in this revision

Viewing changes to tests/plugins/Dash/cardcreator/4.res

  • Committer: Michael Terry
  • Date: 2014-08-21 12:53:29 UTC
  • mfrom: (1161.1.23 unity8)
  • Revision ID: michael.terry@canonical.com-20140821125329-8c14utjip4id3e7m
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/plugins/Dash/cardcreator/4.res
74
74
                    wrapMode: Text.Wrap; 
75
75
                    maximumLineCount: 2; 
76
76
                    font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
77
 
                    color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
 
77
                    color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
78
78
                    visible: showHeader ; 
79
79
                    text: root.title; 
80
80
                    font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
92
92
                        elide: Text.ElideRight; 
93
93
                        fontSize: "small"; 
94
94
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
95
 
                        color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
 
95
                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
96
96
                        visible: titleLabel.visible && titleLabel.text; 
97
97
                        text: cardData && cardData["subtitle"] || ""; 
98
98
                        font.weight: Font.Light;