Merge lp:~mterry/trust-store/no-ubuntucolors into lp:trust-store

[Michael Terry]

Use theme colors in the trust dialog instead of hard-coded ones.

Use theme colors in the trust dialog instead of hard-coded ones.

Unmerged revisions

157. By Michael Terry on 2016-05-23

Don't hardcode colors

=== modified file 'src/core/trust/mir/prompt_main.qml'
--- src/core/trust/mir/prompt_main.qml	2015-11-30 10:45:41 +0000
+++ src/core/trust/mir/prompt_main.qml	2016-05-23 02:05:56 +0000
@@ -59,7 +59,7 @@
                 Label {
                     anchors.horizontalCenter: parent.horizontalCenter
                     text: appId
-                    color: UbuntuColors.lightGrey
+                    color: theme.palette.normal.backgroundSecondaryText
                     fontSize: "small"
                     width: parent.width
                     horizontalAlignment: Text.AlignHCenter
@@ -76,12 +76,11 @@
             }
             Button {
                 text: i18n.tr("Allow")
-                color: UbuntuColors.green
+                color: theme.palette.normal.positive
                 onClicked: quit(0)
             }
             Button {
                 text: i18n.tr("Don’t Allow")
-                color: UbuntuColors.lightGrey
                 onClicked: quit(1)
             }           
         }