ubuntu-system-settings

Merge lp:~laney/ubuntu-system-settings/category-grid-vertical-spacing into lp:ubuntu-system-settings

  1. category-grid-vertical-spacing
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 823
Merged at revision: 824
Proposed branch: lp:~laney/ubuntu-system-settings/category-grid-vertical-spacing
Merge into: lp:ubuntu-system-settings
Diff against target: 11 lines (+1/-0)
1 file modified
src/qml/CategoryGrid.qml (+1/-0)
To merge this branch: bzr merge lp:~laney/ubuntu-system-settings/category-grid-vertical-spacing
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+227705@code.launchpad.net

Commit message

Add 1 gu of spacing between rows in the main screen's grid

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks, looks better indeed!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:823
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1032/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1902
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/224/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/224
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/224/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/224/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2492
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3510
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2132
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2132/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1032/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:823
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1033/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/225
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/225/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3528
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2140
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2140/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1033/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/CategoryGrid.qml'
2--- src/qml/CategoryGrid.qml 2013-11-15 17:17:49 +0000
3+++ src/qml/CategoryGrid.qml 2014-07-22 11:22:51 +0000
4@@ -31,6 +31,7 @@
5 property int n: 4
6
7 columnSpacing: space / ((2 * n) + (columns - 1))
8+ rowSpacing: units.gu(1)
9 width: (columns * itemWidth) + columnSpacing * (columns - 1)
10 anchors.horizontalCenter: parent.horizontalCenter
11 columns: {

Subscribers

People subscribed via source and target branches