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 |
Related bugs: |
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.
LGTM but there are some conflicts in the code