Merge lp:~renatofilho/content-hub/fix-divider-color into lp:content-hub

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Michael Sheldon
Approved revision: 223
Merged at revision: 223
Proposed branch: lp:~renatofilho/content-hub/fix-divider-color
Merge into: lp:content-hub
Diff against target: 11 lines (+1/-0)
1 file modified
import/Ubuntu/Content/ContentPeerPicker11.qml (+1/-0)
To merge this branch: bzr merge lp:~renatofilho/content-hub/fix-divider-color
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+263537@code.launchpad.net

Commit message

Fixed header divider color for ContentPeerPicker11.

Description of the change

Fixed header divider color for ContentPeerPicker11.

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

 * Yes (minus attaching contacts in gmail, due to bug #1466892)

If you changed the UI, was the change specified/approved by design?

 * No change (other than to fix incorrect colouring)

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

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
Michael Sheldon (michael-sheldon) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes (filled out on submitter's behalf)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import/Ubuntu/Content/ContentPeerPicker11.qml'
2--- import/Ubuntu/Content/ContentPeerPicker11.qml 2015-01-22 15:40:29 +0000
3+++ import/Ubuntu/Content/ContentPeerPicker11.qml 2015-07-01 16:08:46 +0000
4@@ -49,6 +49,7 @@
5 id: header
6 title: headerText ? headerText : (handler === ContentHandler.Source) ? i18n.dtr("content-hub", "Choose from") : (handler === ContentHandler.Destination ? i18n.dtr("content-hub", "Open with") : i18n.dtr("content-hub", "Share to"))
7 useDeprecatedToolbar: false
8+ dividerColor: Qt.darker(Theme.palette.normal.background, 1.1)
9 config: PageHeadConfiguration {
10 backAction: Action {
11 objectName: "cancel"

Subscribers

People subscribed via source and target branches