Merge lp:~zsombi/ubuntu-ui-toolkit/thindivider-margins into lp:ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 1306 |
Merged at revision: | 1308 |
Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/thindivider-margins |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
86 lines (+51/-9) 3 files modified
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-5) modules/Ubuntu/Components/ListItems/ThinDivider.qml (+4/-4) tests/resources/listitems/Dividers.qml (+46/-0) |
To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/thindivider-margins |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Tim Peeters | Approve | ||
Review via email: mp+239320@code.launchpad.net |
Commit message
ThinDivider margins rolled back to edge-to-edge. Divider colors adjusted with design.
To post a comment you must log in.
FAILED: Continuous integration, rev:1304 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1158/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/6157 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- amd64-ci/ 991 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 990 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 990/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- i386-ci/ 990 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5782 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7409 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7409/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 14987
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/1158/ rebuild
http://