Merge lp:~osomon/webbrowser-app/toolbar-spacing into lp:webbrowser-app

[Olivier Tilloy]

Adjust margins in the chrome to be consistent with the default toolbar.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/272
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3978
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3978/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1496
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1273

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/389/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

looks good

review: Approve

=== modified file 'src/app/Chrome.qml'
--- src/app/Chrome.qml	2013-09-03 20:28:36 +0000
+++ src/app/Chrome.qml	2013-09-24 11:07:38 +0000
@@ -57,7 +57,7 @@
         objectName: "backButton"
         anchors {
             left: parent.left
-            leftMargin: units.gu(1)
+            leftMargin: units.gu(2)
             verticalCenter: parent.verticalCenter
         }
         // On narrow screens, hide the button to maximize the
@@ -79,7 +79,7 @@
         objectName: "forwardButton"
         anchors {
             left: backButton.right
-            leftMargin: units.gu(1)
+            leftMargin: visible ? units.gu(1) : 0
             verticalCenter: parent.verticalCenter
         }
         // On narrow screen, hide the button to maximize
@@ -118,7 +118,7 @@
         anchors {
             verticalCenter: parent.verticalCenter
             right: parent.right
-            margins: units.gu(1)
+            rightMargin: units.gu(2)
         }
         width: units.gu(5)
         height: width