Merge lp:~vthompson/music-app/readable-error-message-1295932 into lp:music-app/trusty

[Victor Thompson]

* Fix new playlist error text color

* Fix new playlist error text color

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:513
http://91.189.93.70:8080/job/music-app-ci/913/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/808
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/137

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/913/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looks good :)

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2014-06-29 22:19:03 +0000
+++ music-app.qml	2014-07-03 03:18:49 +0000
@@ -704,8 +704,9 @@
                 objectName: "playlistnameTextfield"
                 placeholderText: i18n.tr("Name")
             }
-            ListItem.Standard {
+            Label {
                 id: newplaylistoutput
+                color: "white"
                 visible: false // should only be visible when an error is made.
             }