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

Proposed by Michael Terry on 2016-05-23
Status: Needs review
Proposed branch: lp:~mterry/trust-store/no-ubuntucolors
Merge into: lp:trust-store
Diff against target: 26 lines (+2/-3)
1 file modified
src/core/trust/mir/prompt_main.qml (+2/-3)
To merge this branch: bzr merge lp:~mterry/trust-store/no-ubuntucolors
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team 2016-05-23 Pending
Review via email: mp+295410@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Unmerged revisions

157. By Michael Terry on 2016-05-23

Don't hardcode colors

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/trust/mir/prompt_main.qml'
2--- src/core/trust/mir/prompt_main.qml 2015-11-30 10:45:41 +0000
3+++ src/core/trust/mir/prompt_main.qml 2016-05-23 02:05:56 +0000
4@@ -59,7 +59,7 @@
5 Label {
6 anchors.horizontalCenter: parent.horizontalCenter
7 text: appId
8- color: UbuntuColors.lightGrey
9+ color: theme.palette.normal.backgroundSecondaryText
10 fontSize: "small"
11 width: parent.width
12 horizontalAlignment: Text.AlignHCenter
13@@ -76,12 +76,11 @@
14 }
15 Button {
16 text: i18n.tr("Allow")
17- color: UbuntuColors.green
18+ color: theme.palette.normal.positive
19 onClicked: quit(0)
20 }
21 Button {
22 text: i18n.tr("Don’t Allow")
23- color: UbuntuColors.lightGrey
24 onClicked: quit(1)
25 }
26 }

Subscribers

People subscribed via source and target branches