Merge lp://qastaging/~ken-vandine/ubuntu-system-settings/consistency_tweaks into lp://qastaging/ubuntu-system-settings
Proposed by
Ken VanDine
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 42 |
Merged at revision: | 40 |
Proposed branch: | lp://qastaging/~ken-vandine/ubuntu-system-settings/consistency_tweaks |
Merge into: | lp://qastaging/ubuntu-system-settings |
Diff against target: |
83 lines (+20/-29) 3 files modified
plugins/flight-mode/EntryComponent.qml (+7/-23) src/qml/CategoryGrid.qml (+5/-2) src/qml/EntryComponent.qml (+8/-4) |
To merge this branch: | bzr merge lp://qastaging/~ken-vandine/ubuntu-system-settings/consistency_tweaks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher (community) | Approve | ||
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
* Wrap the icons with an UbuntuShape, this makes it look more consistent with
the shell icons.
* Added a leftMargin in the CategoryGrid so the section titles aren't right
against the edge
* Make flight-mode a ListItem.Standard to be more consistent with the about
plugin.
Description of the change
* Wrap the icons with an UbuntuShape, this makes it look more consistent with
the shell icons.
* Added a leftMargin in the CategoryGrid so the section titles aren't right
against the edge
* Make flight-mode a ListItem.Standard to be more consistent with the about
plugin.
To post a comment you must log in.
PASSED: Continuous integration, rev:42 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/10/ jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- saucy-amd64- ci/10
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ ubuntu- system- settings- ci/10/rebuild
http://