Merge lp:~mardy/ubuntu-system-settings-online-accounts/colors-1581047 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan on 2016-05-23
Status: Merged
Approved by: David Barth on 2016-06-13
Approved revision: 353
Merged at revision: 354
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/colors-1581047
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 12 lines (+1/-1)
1 file modified
online-accounts-ui/qml/AuthorizationPage.qml (+1/-1)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/colors-1581047
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Online Accounts 2016-05-23 Pending
Review via email: mp+295421@code.launchpad.net

Commit message

Replace incorrect usage of UbuntuColors

Description of the change

Replace incorrect usage of UbuntuColors

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-ui/qml/AuthorizationPage.qml'
2--- online-accounts-ui/qml/AuthorizationPage.qml 2016-03-24 14:03:53 +0000
3+++ online-accounts-ui/qml/AuthorizationPage.qml 2016-05-23 07:28:51 +0000
4@@ -127,7 +127,7 @@
5 objectName: "allowButton"
6 anchors.left: parent.left
7 anchors.right: parent.right
8- color: UbuntuColors.green
9+ color: theme.palette.normal.positive
10 text: i18n.tr("Allow")
11 onClicked: root.allowed(root.model.get(accountSelector.selectedIndex, "accountId"))
12 }

Subscribers

People subscribed via source and target branches