Merge lp:~mikemc/ubuntuone-credentials/improve-fontsize-spacing into lp:ubuntuone-credentials

[Mike McCracken]

- Fix spacing and margins of login/register UI. Use default fontSizes pending design input.

- Fix spacing and margins of login/register UI. Use default fontSizes pending design input.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'online-accounts-provider/LoginForm.qml'
--- online-accounts-provider/LoginForm.qml	2013-09-03 20:38:59 +0000
+++ online-accounts-provider/LoginForm.qml	2013-09-03 20:38:59 +0000
@@ -18,7 +18,6 @@
 
         Label {
             text: "I am a returning user and my password is:"
-            fontSize: "small"
         }
         TextField {
             id: passwordTextField
@@ -33,7 +32,6 @@
         Label {
             text: '<a href="https://login.ubuntu.com/+forgot_password"><span style="color: #dd4814;">Forgotten your password?</span></a>'
             textFormat: Text.RichText
-            fontSize: "small"
             onLinkActivated: { Qt.openUrlExternally(link); }
         }
 
@@ -53,7 +51,6 @@
 
             Label {
                 text: "Type your verification code:"
-                fontSize: "small"
             }
 
             TextField {
@@ -70,7 +67,6 @@
             Label {
                 text: '<a href="https://login.ubuntu.com/+device-help"><span style="color: #dd4814;">Authentication Device Help</span></a>'
                 textFormat: Text.RichText
-                fontSize: "small"
                 onLinkActivated: { Qt.openUrlExternally(link); }
             }
 

=== modified file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	2013-08-22 21:32:30 +0000
+++ online-accounts-provider/NewAccount.qml	2013-09-03 20:38:59 +0000
@@ -24,12 +24,8 @@
 Column {
     id: main
 
-    //property variant authenticationParameters: null
-
     property bool isNewAccount: false
     property variant __account: account
-// unneeded:?    property alias globalAccountService: globalAccountSettings
-
 
     state: "login" // or "register" or "twofactor"
     property var currentVisible: loginForm
@@ -37,8 +33,12 @@
 
     signal finished
 
+    anchors.top: parent.top
     anchors.left: parent.left
     anchors.right: parent.right
+    anchors.margins: units.gu(1)
+
+    spacing: units.gu(2)
 
     Component.onCompleted: {
         isNewAccount = (account.accountId === 0);
@@ -48,7 +48,6 @@
     Label {
         id: title
         text: "One account to log in to everything on Ubuntu"
-        fontSize: "medium"
         color: UbuntuColors.coolGrey
         anchors.left: parent.left
         anchors.right: parent.right
@@ -70,7 +69,6 @@
 
     Label {
         text: "Please type your email:"
-        fontSize: "large"
 
         anchors.left: parent.left
         anchors.right: parent.right
@@ -100,7 +98,6 @@
         Label {
             anchors.verticalCenter: newUserToggleSwitch.verticalCenter
             text: "I am a new Ubuntu One user"
-            fontSize: "large"
         }
         anchors.left: parent.left
         anchors.right: parent.right

=== modified file 'online-accounts-provider/RegisterForm.qml'
--- online-accounts-provider/RegisterForm.qml	2013-09-03 20:38:59 +0000
+++ online-accounts-provider/RegisterForm.qml	2013-09-03 20:38:59 +0000
@@ -18,7 +18,6 @@
 
         Label {
             id: subtitle
-            fontSize: "small"
             text: "Please tell us your name and choose a password."
         }
         
@@ -51,7 +50,6 @@
             Label {
                 anchors.verticalCenter: termsAndConditionsCheckBox.verticalCenter
                 text: "I agree to the <a href='http://one.ubuntu.com/terms/'>Ubuntu One Terms and Conditions</a>"
-                fontSize: "small"
                 onLinkActivated: { Qt.openUrlExternally(link); }
             }
         }