Merge lp:~tpeeters/ubuntu-ui-toolkit/foregroundIconColorFix into lp:ubuntu-ui-toolkit/staging

Proposed by Tim Peeters
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1719
Merged at revision: 1719
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/foregroundIconColorFix
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 20 lines (+10/-0)
1 file modified
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+10/-0)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/foregroundIconColorFix
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+277903@code.launchpad.net

Commit message

Fix the icon color in the AppHeader.

Description of the change

Fix the icon color in the AppHeader.

I did not spend time on adding a regression test, because this is the header that we are deprecating in 1.3. I verified that for the new PageHeader, the icon color was already correct.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Thanks for the fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
2--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml 2015-09-22 14:39:47 +0000
3+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml 2015-11-18 20:17:52 +0000
4@@ -403,6 +403,16 @@
5
6 actions: headerStyle.config.actions
7 numberOfSlots: 3
8+
9+ delegate: AbstractButton {
10+ style: IconButtonStyle { }
11+ objectName: action.objectName + "_button"
12+ height: parent ? parent.height : undefined
13+ action: modelData
14+ StyleHints {
15+ foregroundColor: headerStyle.buttonColor
16+ }
17+ }
18 }
19 }
20 }

Subscribers

People subscribed via source and target branches