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

[Karl Williams]

Various minor changes from the design review with Karlos

[Anthony Dillon (ya-bo-ng)]

LGTM but there are some conflicts in the code

review: Needs Fixing

[lp:~deadlight/canonical-identity-provider/design-review]

1722. By Karl Williams on 2019-09-10

Merge from feature branch

[Anthony Dillon (ya-bo-ng)]

Thanks for fixing the conflicts +1

review: Approve

=== modified file 'src/identityprovider/static_src/scss/styles.scss'
--- src/identityprovider/static_src/scss/styles.scss	2019-08-30 16:17:49 +0000
+++ src/identityprovider/static_src/scss/styles.scss	2019-09-10 15:54:51 +0000
@@ -48,11 +48,11 @@
 
     &::before {
       background-color: $color-mid-light;
-      bottom: -$spv-inner--x-small;
+      bottom: 0;
       content: '';
       left: -$sph-inner;
       position: absolute;
-      top: -$spv-inner--x-small;
+      top: 0;
       width: $bar-thickness;
     }
   }
 
=== modified file 'src/webui/templates/account/confirm_new_email.html'
--- src/webui/templates/account/confirm_new_email.html	2019-09-04 16:27:41 +0000
+++ src/webui/templates/account/confirm_new_email.html	2019-09-10 15:54:51 +0000
@@ -30,8 +30,8 @@
     </p>
     {% endif %}
     <input type="hidden" name="post" value="yes" />
+    <button type="submit" name="continue" class="p-button--positive" data-qa-id="confirm_email_validation">{% trans "Yes, I'm sure" %}</button>
     <a class="p-button--base" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a>
-    <button type="submit" name="continue" class="p-button--positive" data-qa-id="confirm_email_validation">{% trans "Yes, I'm sure" %}</button>
   </form>
 </div>
 {% endblock %}
 
=== modified file 'src/webui/templates/account/delete_email.html'
--- src/webui/templates/account/delete_email.html	2019-09-04 16:27:41 +0000
+++ src/webui/templates/account/delete_email.html	2019-09-10 15:54:51 +0000
@@ -23,7 +23,7 @@
       <form action="" method="POST">
         {% csrf_token %}
         <button type="submit" class="p-button--negative" name="delete" data-qa-id="confirm_delete_email">{% trans "Yes, delete" %}</button>
-        {% include "common/cancel_link.html" %}
+        <a href="/" class="p-button--base">Cancel</a>
       </form>
     </div>
   </div>
 
=== modified file 'src/webui/templates/account/edit.html'
--- src/webui/templates/account/edit.html	2019-09-04 16:27:41 +0000
+++ src/webui/templates/account/edit.html	2019-09-10 15:54:51 +0000
@@ -137,9 +137,8 @@
     </div>
 
     {% if not readonly %}
-    <button type="submit" class="p-button--positive" name="update" data-qa-id="update_preferences">
-      <span>{% trans "Save changes" %}</span>
-    </button>
+    <button type="submit" class="p-button--positive" name="update" data-qa-id="update_preferences">{% trans "Save changes" %}</button>
+    <a href="/+delete" data-qa-id="delete_account_link" class="p-button--base">{% trans "Permanently delete account" %}</a>
     {% endif %}
     {% if token %}
     {% trans "or" %}
@@ -147,8 +146,6 @@
     {% endif %}
   </form>
 
-  <p><a href="/+delete" data-qa-id="delete_account_link">{% trans "Permanently delete account" %}</a></p>
-
   {% include "widgets/last_auth_sites.html" %}
 
 {% endblock %}
 
=== modified file 'src/webui/templates/account/emails.html'
--- src/webui/templates/account/emails.html	2019-08-21 16:06:42 +0000
+++ src/webui/templates/account/emails.html	2019-09-10 15:54:51 +0000
@@ -20,7 +20,7 @@
     <p>{% blocktrans %}You have no email addresses associated with your account.{% endblocktrans %}</p>
   {% endif %}
   {% if verified_emails %}
-  <section class="p-strip is-shallow u-no-padding--bottom">
+  <section class="p-strip is-shallow {% if unverified_emails %} u-no-padding--bottom{% endif %}">
     <table class="p-table">
       <thead>
         <tr>
 
=== modified file 'src/webui/templates/account/new_email.html'
--- src/webui/templates/account/new_email.html	2019-09-05 13:35:47 +0000
+++ src/webui/templates/account/new_email.html	2019-09-10 15:54:51 +0000
@@ -27,8 +27,8 @@
         </p>
         {% endif %}
       </div>
+      <button type="submit" class="p-button--primary" name="continue" data-qa-id="send_instructions_confirm_email">{% trans "Send instructions" %}</button>
       <a class="p-button--base" href="/">{% trans "Cancel" %}</a>
-      <button type="submit" class="p-button--positive" name="continue" data-qa-id="send_instructions_confirm_email">{% trans "Send instructions" %}</button>
     </form>
   </div>
 </div>
 
=== modified file 'src/webui/templates/device/addition-generic.html'
--- src/webui/templates/device/addition-generic.html	2019-08-21 16:06:42 +0000
+++ src/webui/templates/device/addition-generic.html	2019-09-10 15:54:51 +0000
@@ -70,6 +70,6 @@
     <input type="hidden" name="type" value="{{ type }}">
     <input type="hidden" name="hex_key" value="{{ hex_key }}">
     <button class="p-button--primary" type="submit" data-qa-id="confirm_add_device">{% trans "Add device" %}</button>
-    <a data-qa-id="cancel_add_device" href="{{ device_list_path }}" class="p-button--neutral">{% trans "cancel" %}</a>
+    <a data-qa-id="cancel_add_device" href="{{ device_list_path }}" class="p-button--neutral">{% trans "Cancel" %}</a>
   </form>
 {% endblock %}
 
=== modified file 'src/webui/templates/menu_item.html'
--- src/webui/templates/menu_item.html	2019-07-22 15:01:03 +0000
+++ src/webui/templates/menu_item.html	2019-09-10 15:54:51 +0000
@@ -9,7 +9,7 @@
     {{ label }}
   </span>
   {% else %}
-  <a id="{{ section }}-link" data-qa-id="{{ section }}_link" href="{{ link }}">
+  <a id="{{ section }}-link" data-qa-id="{{ section }}_link" href="{{ link }}" class="p-link--soft">
     <span {% if extra_qa_data_id %}data-qa-id="{{ extra_qa_data_id }}"{% endif %}>
       {{ label }}
     </span>
 
=== modified file 'src/webui/templates/registration/sync_2fa.html'
--- src/webui/templates/registration/sync_2fa.html	2019-08-27 12:48:53 +0000
+++ src/webui/templates/registration/sync_2fa.html	2019-09-10 15:54:51 +0000
@@ -61,10 +61,10 @@
         </form>
       </div>
     </div>
-    <div class="col-4">
-      <div class="p-card">
+    <div class="col-5 col-start-large-8">
+      <aside class="p-table-of-contents">
         {% include "registration/two_factor_information.html" %}
-      </div>
+      </aside>
     </div>
   </div>
 {% endblock %}
 
=== modified file 'src/webui/templates/versions.html'
--- src/webui/templates/versions.html	2012-12-04 18:51:42 +0000
+++ src/webui/templates/versions.html	2019-09-10 15:54:51 +0000
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% comment %}
-Copyright 2010 Canonical Ltd.  This software is licensed under the
+Copyright 2010-2019 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}