Merge lp:~deadlight/canonical-identity-provider/design-review into lp:~deadlight/canonical-identity-provider/vanilla

Proposed by Karl Williams
Status: Merged
Merged at revision: 1722
Proposed branch: lp:~deadlight/canonical-identity-provider/design-review
Merge into: lp:~deadlight/canonical-identity-provider/vanilla
Diff against target: 151 lines (+14/-17)
10 files modified
src/identityprovider/static_src/scss/styles.scss (+2/-2)
src/webui/templates/account/confirm_new_email.html (+1/-1)
src/webui/templates/account/delete_email.html (+1/-1)
src/webui/templates/account/edit.html (+2/-5)
src/webui/templates/account/emails.html (+1/-1)
src/webui/templates/account/new_email.html (+1/-1)
src/webui/templates/device/addition-generic.html (+1/-1)
src/webui/templates/menu_item.html (+1/-1)
src/webui/templates/registration/sync_2fa.html (+3/-3)
src/webui/templates/versions.html (+1/-1)
To merge this branch: bzr merge lp:~deadlight/canonical-identity-provider/design-review
Reviewer Review Type Date Requested Status
Anthony Dillon (community) Approve
Review via email: mp+372493@code.launchpad.net

Description of the change

Various minor changes from the design review with Karlos

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

LGTM but there are some conflicts in the code

review: Needs Fixing
1722. By Karl Williams

Merge from feature branch

Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Thanks for fixing the conflicts +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/identityprovider/static_src/scss/styles.scss'
2--- src/identityprovider/static_src/scss/styles.scss 2019-08-30 16:17:49 +0000
3+++ src/identityprovider/static_src/scss/styles.scss 2019-09-10 15:54:51 +0000
4@@ -48,11 +48,11 @@
5
6 &::before {
7 background-color: $color-mid-light;
8- bottom: -$spv-inner--x-small;
9+ bottom: 0;
10 content: '';
11 left: -$sph-inner;
12 position: absolute;
13- top: -$spv-inner--x-small;
14+ top: 0;
15 width: $bar-thickness;
16 }
17 }
18
19=== modified file 'src/webui/templates/account/confirm_new_email.html'
20--- src/webui/templates/account/confirm_new_email.html 2019-09-04 16:27:41 +0000
21+++ src/webui/templates/account/confirm_new_email.html 2019-09-10 15:54:51 +0000
22@@ -30,8 +30,8 @@
23 </p>
24 {% endif %}
25 <input type="hidden" name="post" value="yes" />
26+ <button type="submit" name="continue" class="p-button--positive" data-qa-id="confirm_email_validation">{% trans "Yes, I'm sure" %}</button>
27 <a class="p-button--base" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a>
28- <button type="submit" name="continue" class="p-button--positive" data-qa-id="confirm_email_validation">{% trans "Yes, I'm sure" %}</button>
29 </form>
30 </div>
31 {% endblock %}
32
33=== modified file 'src/webui/templates/account/delete_email.html'
34--- src/webui/templates/account/delete_email.html 2019-09-04 16:27:41 +0000
35+++ src/webui/templates/account/delete_email.html 2019-09-10 15:54:51 +0000
36@@ -23,7 +23,7 @@
37 <form action="" method="POST">
38 {% csrf_token %}
39 <button type="submit" class="p-button--negative" name="delete" data-qa-id="confirm_delete_email">{% trans "Yes, delete" %}</button>
40- {% include "common/cancel_link.html" %}
41+ <a href="/" class="p-button--base">Cancel</a>
42 </form>
43 </div>
44 </div>
45
46=== modified file 'src/webui/templates/account/edit.html'
47--- src/webui/templates/account/edit.html 2019-09-04 16:27:41 +0000
48+++ src/webui/templates/account/edit.html 2019-09-10 15:54:51 +0000
49@@ -137,9 +137,8 @@
50 </div>
51
52 {% if not readonly %}
53- <button type="submit" class="p-button--positive" name="update" data-qa-id="update_preferences">
54- <span>{% trans "Save changes" %}</span>
55- </button>
56+ <button type="submit" class="p-button--positive" name="update" data-qa-id="update_preferences">{% trans "Save changes" %}</button>
57+ <a href="/+delete" data-qa-id="delete_account_link" class="p-button--base">{% trans "Permanently delete account" %}</a>
58 {% endif %}
59 {% if token %}
60 {% trans "or" %}
61@@ -147,8 +146,6 @@
62 {% endif %}
63 </form>
64
65- <p><a href="/+delete" data-qa-id="delete_account_link">{% trans "Permanently delete account" %}</a></p>
66-
67 {% include "widgets/last_auth_sites.html" %}
68
69 {% endblock %}
70
71=== modified file 'src/webui/templates/account/emails.html'
72--- src/webui/templates/account/emails.html 2019-08-21 16:06:42 +0000
73+++ src/webui/templates/account/emails.html 2019-09-10 15:54:51 +0000
74@@ -20,7 +20,7 @@
75 <p>{% blocktrans %}You have no email addresses associated with your account.{% endblocktrans %}</p>
76 {% endif %}
77 {% if verified_emails %}
78- <section class="p-strip is-shallow u-no-padding--bottom">
79+ <section class="p-strip is-shallow {% if unverified_emails %} u-no-padding--bottom{% endif %}">
80 <table class="p-table">
81 <thead>
82 <tr>
83
84=== modified file 'src/webui/templates/account/new_email.html'
85--- src/webui/templates/account/new_email.html 2019-09-05 13:35:47 +0000
86+++ src/webui/templates/account/new_email.html 2019-09-10 15:54:51 +0000
87@@ -27,8 +27,8 @@
88 </p>
89 {% endif %}
90 </div>
91+ <button type="submit" class="p-button--primary" name="continue" data-qa-id="send_instructions_confirm_email">{% trans "Send instructions" %}</button>
92 <a class="p-button--base" href="/">{% trans "Cancel" %}</a>
93- <button type="submit" class="p-button--positive" name="continue" data-qa-id="send_instructions_confirm_email">{% trans "Send instructions" %}</button>
94 </form>
95 </div>
96 </div>
97
98=== modified file 'src/webui/templates/device/addition-generic.html'
99--- src/webui/templates/device/addition-generic.html 2019-08-21 16:06:42 +0000
100+++ src/webui/templates/device/addition-generic.html 2019-09-10 15:54:51 +0000
101@@ -70,6 +70,6 @@
102 <input type="hidden" name="type" value="{{ type }}">
103 <input type="hidden" name="hex_key" value="{{ hex_key }}">
104 <button class="p-button--primary" type="submit" data-qa-id="confirm_add_device">{% trans "Add device" %}</button>
105- <a data-qa-id="cancel_add_device" href="{{ device_list_path }}" class="p-button--neutral">{% trans "cancel" %}</a>
106+ <a data-qa-id="cancel_add_device" href="{{ device_list_path }}" class="p-button--neutral">{% trans "Cancel" %}</a>
107 </form>
108 {% endblock %}
109
110=== modified file 'src/webui/templates/menu_item.html'
111--- src/webui/templates/menu_item.html 2019-07-22 15:01:03 +0000
112+++ src/webui/templates/menu_item.html 2019-09-10 15:54:51 +0000
113@@ -9,7 +9,7 @@
114 {{ label }}
115 </span>
116 {% else %}
117- <a id="{{ section }}-link" data-qa-id="{{ section }}_link" href="{{ link }}">
118+ <a id="{{ section }}-link" data-qa-id="{{ section }}_link" href="{{ link }}" class="p-link--soft">
119 <span {% if extra_qa_data_id %}data-qa-id="{{ extra_qa_data_id }}"{% endif %}>
120 {{ label }}
121 </span>
122
123=== modified file 'src/webui/templates/registration/sync_2fa.html'
124--- src/webui/templates/registration/sync_2fa.html 2019-08-27 12:48:53 +0000
125+++ src/webui/templates/registration/sync_2fa.html 2019-09-10 15:54:51 +0000
126@@ -61,10 +61,10 @@
127 </form>
128 </div>
129 </div>
130- <div class="col-4">
131- <div class="p-card">
132+ <div class="col-5 col-start-large-8">
133+ <aside class="p-table-of-contents">
134 {% include "registration/two_factor_information.html" %}
135- </div>
136+ </aside>
137 </div>
138 </div>
139 {% endblock %}
140
141=== modified file 'src/webui/templates/versions.html'
142--- src/webui/templates/versions.html 2012-12-04 18:51:42 +0000
143+++ src/webui/templates/versions.html 2019-09-10 15:54:51 +0000
144@@ -2,7 +2,7 @@
145 {% load i18n %}
146
147 {% comment %}
148-Copyright 2010 Canonical Ltd. This software is licensed under the
149+Copyright 2010-2019 Canonical Ltd. This software is licensed under the
150 GNU Affero General Public License version 3 (see the file LICENSE).
151 {% endcomment %}
152

Subscribers

People subscribed via source and target branches

to all changes: