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
=== modified file 'src/webui/templates/registration/login.html'
--- src/webui/templates/registration/login.html 2020-01-22 12:52:26 +0000
+++ src/webui/templates/registration/login.html 2020-02-10 17:33:10 +0000
@@ -20,7 +20,7 @@
20{% block html_extra %}data-qa-id="login"{% endblock %}20{% block html_extra %}data-qa-id="login"{% endblock %}
2121
22{% block text_title %}22{% block text_title %}
23 {% trans "One account to log in to everything on Ubuntu" %}23 {% trans "One account for everything on Ubuntu" %}
24{% endblock %}24{% endblock %}
2525
26</div>26</div>
2727
=== modified file 'src/webui/templates/registration/new_account.html'
--- src/webui/templates/registration/new_account.html 2020-01-22 12:52:26 +0000
+++ src/webui/templates/registration/new_account.html 2020-02-10 17:33:10 +0000
@@ -19,7 +19,7 @@
19 {% if rpconfig and rpconfig.logo_url %}19 {% if rpconfig and rpconfig.logo_url %}
20 <img id="rpconfig_logo" src="{{ rpconfig.logo_url }}">20 <img id="rpconfig_logo" src="{{ rpconfig.logo_url }}">
21 {% else %}21 {% else %}
22 {% trans "One account to log in to everything on Ubuntu" %}22 {% trans "One account for everything on Ubuntu" %}
23 {% endif %}23 {% endif %}
24{% endblock %}24{% endblock %}
2525
2626
=== modified file 'src/webui/templates/registration/sync_2fa.html'
--- src/webui/templates/registration/sync_2fa.html 2020-01-22 12:52:26 +0000
+++ src/webui/templates/registration/sync_2fa.html 2020-02-10 17:33:10 +0000
@@ -21,7 +21,7 @@
21{% block content_class %}{% endblock %}21{% block content_class %}{% endblock %}
2222
23{% block text_title %}23{% block text_title %}
24 {% trans "One account to log in to everything on Ubuntu" %}24 {% trans "One account for everything on Ubuntu" %}
25{% endblock %}25{% endblock %}
2626
27{% block bodyclass %}{% endblock %}27{% block bodyclass %}{% endblock %}
2828
=== modified file 'src/webui/templates/registration/twofactor.html'
--- src/webui/templates/registration/twofactor.html 2020-01-22 12:52:26 +0000
+++ src/webui/templates/registration/twofactor.html 2020-02-10 17:33:10 +0000
@@ -6,7 +6,7 @@
6{% block html_extra %}data-qa-id="two_factor_verify"{% endblock %}6{% block html_extra %}data-qa-id="two_factor_verify"{% endblock %}
77
8{% block text_title %}8{% block text_title %}
9 {% trans "One account to log in to everything on Ubuntu" %}9 {% trans "One account for everything on Ubuntu" %}
10{% endblock %}10{% endblock %}
1111
12{% block bodyclass %}{% endblock %}12{% block bodyclass %}{% endblock %}
1313
=== modified file 'src/webui/templates/static/ubuntuone-account.html'
--- src/webui/templates/static/ubuntuone-account.html 2020-01-23 12:00:12 +0000
+++ src/webui/templates/static/ubuntuone-account.html 2020-02-10 17:33:10 +0000
@@ -20,7 +20,7 @@
20{% block content %}20{% block content %}
21 <div class="row">21 <div class="row">
22 <div class="col-8">22 <div class="col-8">
23 <h3>{% trans "One account to log in to everything on Ubuntu" %}</h3>23 <h3>{% trans "One account for everything on Ubuntu" %}</h3>
24 <p>{% blocktrans %}Ubuntu One is the single account you use to log in to24 <p>{% blocktrans %}Ubuntu One is the single account you use to log in to
25 all services and sites related to Ubuntu.{% endblocktrans %}</p>25 all services and sites related to Ubuntu.{% endblocktrans %}</p>
26 <h3>{% trans "Already have an SSO account?" %}</h3>26 <h3>{% trans "Already have an SSO account?" %}</h3>
2727
=== modified file 'src/webui/templates/vanilla/base.html'
--- src/webui/templates/vanilla/base.html 2020-02-04 17:06:23 +0000
+++ src/webui/templates/vanilla/base.html 2020-02-10 17:33:10 +0000
@@ -44,8 +44,8 @@
44 <div id="content">44 <div id="content">
45 <section class="p-strip--dark p-cip-hero is-shallow">45 <section class="p-strip--dark p-cip-hero is-shallow">
46 <div class="row">46 <div class="row">
47 <div class="col-7">47 <div class="col-12">
48 <h1 class="u-no-margin--bottom">{% block text_title %}{% endblock %}</h1>48 <h1 class="u-no-margin--bottom" style="max-width: 100%">{% block text_title %}{% endblock %}</h1>
49 </div>49 </div>
50 </div>50 </div>
51 </section>51 </section>