ubuntuone-credentials

Merge lp:~mikemc/ubuntuone-credentials/transparent-and-smallfont into lp:ubuntuone-credentials

  1. transparent-and-smallfont
  2. Merge into trunk
Proposed by Mike McCracken
Status: Merged
Approved by: dobey
Approved revision: 62
Merged at revision: 42
Proposed branch: lp:~mikemc/ubuntuone-credentials/transparent-and-smallfont
Merge into: lp:ubuntuone-credentials
Prerequisite: lp:~mikemc/ubuntuone-credentials/add-qmltypes
Diff against target: 85 lines (+9/-9)
3 files modified
qml-credentials-service/CredentialsUI.qml (+5/-5)
qml-credentials-service/LoginForm.qml (+2/-2)
qml-credentials-service/RegisterForm.qml (+2/-2)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-credentials/transparent-and-smallfont
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+176527@code.launchpad.net

Commit message

- Make background of embeddable component transparent, and use smaller font sizes to fit better on small screens.

Description of the change

- Make background of embeddable component transparent, and use smaller font sizes to fit better on small screens.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml-credentials-service/CredentialsUI.qml'
2--- qml-credentials-service/CredentialsUI.qml 2013-07-23 20:22:46 +0000
3+++ qml-credentials-service/CredentialsUI.qml 2013-07-29 22:37:25 +0000
4@@ -11,7 +11,7 @@
5 property var currentVisible: loginForm
6 property var formValid: false;
7
8- color: "white"
9+ color: "transparent"
10
11 signal userCancelled()
12 signal succeeded()
13@@ -28,8 +28,8 @@
14
15 Label {
16 id: title
17- text: "One account to log in to\neverything on Ubuntu"
18- fontSize: "x-large"
19+ text: "One account to log in to everything on Ubuntu"
20+ fontSize: "large"
21 color: UbuntuColors.coolGrey
22 anchors.left: parent.left
23 anchors.right: parent.right
24@@ -51,7 +51,7 @@
25
26 Label {
27 text: "Please type your email:"
28- fontSize: "large"
29+ fontSize: "small"
30
31 anchors.left: parent.left
32 anchors.right: parent.right
33@@ -83,7 +83,7 @@
34 Label {
35 anchors.verticalCenter: newUserToggleSwitch.verticalCenter
36 text: "I am a new Ubuntu One user"
37- fontSize: "large"
38+ fontSize: "small"
39 }
40 anchors.left: parent.left
41 anchors.right: parent.right
42
43=== modified file 'qml-credentials-service/LoginForm.qml'
44--- qml-credentials-service/LoginForm.qml 2013-07-29 20:37:58 +0000
45+++ qml-credentials-service/LoginForm.qml 2013-07-29 22:37:25 +0000
46@@ -18,7 +18,7 @@
47
48 Label {
49 text: "I am a returning user and my password is:"
50- fontSize: "large"
51+ fontSize: "small"
52 }
53 TextField {
54 id: passwordTextField
55@@ -47,7 +47,7 @@
56
57 Label {
58 text: "Type your verification code:"
59- fontSize: "large"
60+ fontSize: "small"
61 }
62
63 TextField {
64
65=== modified file 'qml-credentials-service/RegisterForm.qml'
66--- qml-credentials-service/RegisterForm.qml 2013-07-29 20:37:58 +0000
67+++ qml-credentials-service/RegisterForm.qml 2013-07-29 22:37:25 +0000
68@@ -18,7 +18,7 @@
69
70 Label {
71 id: subtitle
72- fontSize: "large"
73+ fontSize: "small"
74 text: "Please tell us your name and choose a password."
75 }
76
77@@ -51,7 +51,7 @@
78 Label {
79 anchors.verticalCenter: termsAndConditionsCheckBox.verticalCenter
80 text: "I agree to the <a href='http://one.ubuntu.com/terms/'>Ubuntu One Terms and Conditions</a>"
81- fontSize: "medium"
82+ fontSize: "small"
83 onLinkActivated: { Qt.openUrlExternally(link); }
84 }
85 }

Subscribers

People subscribed via source and target branches

to all changes: