Merge lp:~ken-vandine/signon-ui/lp1231691_spacing into lp:signon-ui

[Ken VanDine]

Put the cancel button in a ListItem to ensure consistent spacing with
other elements in system-settings.

Put the cancel button in a ListItem to ensure consistent spacing with
other elements in system-settings.

Unmerged revisions

115. By Ken VanDine on 2013-10-08

Put the cancel button in a ListItem to ensure consistent spacing with
other elements in system-settings.

=== modified file 'src/browser-process/webview.qml'
--- src/browser-process/webview.qml	2013-10-08 08:13:04 +0000
+++ src/browser-process/webview.qml	2013-10-08 14:34:57 +0000
@@ -3,6 +3,7 @@
 import QtWebKit 3.0
 import QtWebKit.experimental 1.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Unity.Action 1.0 as UnityActions
 
 import "ua-overrides.js" as Overrides
@@ -73,13 +74,19 @@
                 onUrlChanged: request.currentUrl = url
             }
 
-            Button {
+            ListItem.SingleControl {
                 id: cancelButton
-                anchors.bottom: parent.bottom
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
-                width: parent.width - units.gu(4)
-                onClicked: request.cancel()
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                }
+                control: Button {
+                    text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
+                    width: parent.width - units.gu(4)
+                    onClicked: request.cancel()
+                }
+                showDivider: false
             }
 
             KeyboardRectangle {