Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/divider into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Tim Peeters
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zsombor Egri | ||||
Approved revision: | 1323 | ||||
Merged at revision: | 1307 | ||||
Proposed branch: | lp://staging/~tpeeters/ubuntu-ui-toolkit/divider | ||||
Merge into: | lp://staging/ubuntu-ui-toolkit/staging | ||||
Diff against target: |
324 lines (+178/-21) 8 files modified
modules/Ubuntu/Components/AppHeader.qml (+5/-0) modules/Ubuntu/Components/MainView.qml (+1/-0) modules/Ubuntu/Components/Styles/PageHeadStyle.qml (+5/-1) modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml (+53/-0) modules/Ubuntu/Components/Themes/Ambiance/HeadSeparatorImageStyle.qml (+36/-0) modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+27/-20) modules/Ubuntu/Components/Themes/Ambiance/qmldir (+2/-0) tests/resources/header/header.qml (+49/-0) |
||||
To merge this branch: | bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/divider | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Zsombor Egri | Approve | ||
Review via email:
|
Commit message
Add updated header divider to use rectangles instead of images, and to auto-detect its color. New divider is disabled until this unity8 MR lands: https:/
To post a comment you must log in.
FAILED: Continuous integration, rev:1315 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1162/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/6181 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- amd64-ci/ 995 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 994 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 994/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- i386-ci/ 994 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5806 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7433 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7433/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 15018
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1162/ rebuild
http://