← Back to branch summary

~paulliu/unity8/shellRotation

« back to all changes in this revision

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

  • Committer: Mirco Müller
  • Date: 2015-03-06 14:22:41 UTC
  • mfrom: (1589.1.1 unity8)
  • Revision ID: mirco.mueller@ubuntu.com-20150306142241-wse3a2j2yghqfwoh
Merged kgunn's conflict-resolving branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/plugins/Dash/cardcreator/5.res
134
134
                            } 
135
135
                            anchors.topMargin: units.dp(2); 
136
136
                            elide: Text.ElideRight; 
 
137
                            maximumLineCount: 1; 
137
138
                            fontSize: "x-small"; 
138
139
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
139
140
                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");