Merge lp:~deadlight/canonical-identity-provider/heading-style into lp:canonical-identity-provider/release

Proposed by Karl Williams
Status: Merged
Approved by: Daniel Manrique
Approved revision: no longer in the source branch.
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~deadlight/canonical-identity-provider/heading-style
Merge into: lp:canonical-identity-provider/release
Diff against target: 79 lines (+7/-7)
6 files modified
src/webui/templates/registration/login.html (+1/-1)
src/webui/templates/registration/new_account.html (+1/-1)
src/webui/templates/registration/sync_2fa.html (+1/-1)
src/webui/templates/registration/twofactor.html (+1/-1)
src/webui/templates/static/ubuntuone-account.html (+1/-1)
src/webui/templates/vanilla/base.html (+2/-2)
To merge this branch: bzr merge lp:~deadlight/canonical-identity-provider/heading-style
Reviewer Review Type Date Requested Status
Maximiliano Bertacchini Approve
Daniel Manrique (community) Approve
Review via email: mp+378830@code.launchpad.net

Commit message

Update vanilla base template to allow full-width headings

Description of the change

- Changed the base template to allow full-width main headings.
- Reduced the length of the default heading

QA:

Load the login page in-browser and see that the heading no longer wraps

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

LGTM! I didn't know/realize the title was repeated in 4/5 places, looks like we could optimize that... later :) this is good for now.

review: Approve
Revision history for this message
Maximiliano Bertacchini (maxiberta) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webui/templates/registration/login.html'
2--- src/webui/templates/registration/login.html 2020-01-22 12:52:26 +0000
3+++ src/webui/templates/registration/login.html 2020-02-10 17:33:10 +0000
4@@ -20,7 +20,7 @@
5 {% block html_extra %}data-qa-id="login"{% endblock %}
6
7 {% block text_title %}
8- {% trans "One account to log in to everything on Ubuntu" %}
9+ {% trans "One account for everything on Ubuntu" %}
10 {% endblock %}
11
12 </div>
13
14=== modified file 'src/webui/templates/registration/new_account.html'
15--- src/webui/templates/registration/new_account.html 2020-01-22 12:52:26 +0000
16+++ src/webui/templates/registration/new_account.html 2020-02-10 17:33:10 +0000
17@@ -19,7 +19,7 @@
18 {% if rpconfig and rpconfig.logo_url %}
19 <img id="rpconfig_logo" src="{{ rpconfig.logo_url }}">
20 {% else %}
21- {% trans "One account to log in to everything on Ubuntu" %}
22+ {% trans "One account for everything on Ubuntu" %}
23 {% endif %}
24 {% endblock %}
25
26
27=== modified file 'src/webui/templates/registration/sync_2fa.html'
28--- src/webui/templates/registration/sync_2fa.html 2020-01-22 12:52:26 +0000
29+++ src/webui/templates/registration/sync_2fa.html 2020-02-10 17:33:10 +0000
30@@ -21,7 +21,7 @@
31 {% block content_class %}{% endblock %}
32
33 {% block text_title %}
34- {% trans "One account to log in to everything on Ubuntu" %}
35+ {% trans "One account for everything on Ubuntu" %}
36 {% endblock %}
37
38 {% block bodyclass %}{% endblock %}
39
40=== modified file 'src/webui/templates/registration/twofactor.html'
41--- src/webui/templates/registration/twofactor.html 2020-01-22 12:52:26 +0000
42+++ src/webui/templates/registration/twofactor.html 2020-02-10 17:33:10 +0000
43@@ -6,7 +6,7 @@
44 {% block html_extra %}data-qa-id="two_factor_verify"{% endblock %}
45
46 {% block text_title %}
47- {% trans "One account to log in to everything on Ubuntu" %}
48+ {% trans "One account for everything on Ubuntu" %}
49 {% endblock %}
50
51 {% block bodyclass %}{% endblock %}
52
53=== modified file 'src/webui/templates/static/ubuntuone-account.html'
54--- src/webui/templates/static/ubuntuone-account.html 2020-01-23 12:00:12 +0000
55+++ src/webui/templates/static/ubuntuone-account.html 2020-02-10 17:33:10 +0000
56@@ -20,7 +20,7 @@
57 {% block content %}
58 <div class="row">
59 <div class="col-8">
60- <h3>{% trans "One account to log in to everything on Ubuntu" %}</h3>
61+ <h3>{% trans "One account for everything on Ubuntu" %}</h3>
62 <p>{% blocktrans %}Ubuntu One is the single account you use to log in to
63 all services and sites related to Ubuntu.{% endblocktrans %}</p>
64 <h3>{% trans "Already have an SSO account?" %}</h3>
65
66=== modified file 'src/webui/templates/vanilla/base.html'
67--- src/webui/templates/vanilla/base.html 2020-02-04 17:06:23 +0000
68+++ src/webui/templates/vanilla/base.html 2020-02-10 17:33:10 +0000
69@@ -44,8 +44,8 @@
70 <div id="content">
71 <section class="p-strip--dark p-cip-hero is-shallow">
72 <div class="row">
73- <div class="col-7">
74- <h1 class="u-no-margin--bottom">{% block text_title %}{% endblock %}</h1>
75+ <div class="col-12">
76+ <h1 class="u-no-margin--bottom" style="max-width: 100%">{% block text_title %}{% endblock %}</h1>
77 </div>
78 </div>
79 </section>