This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Improve styling and wording of SSO redirect confirm template #9272
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| body { | ||
| font-family: "Inter", "Helvetica", "Arial", sans-serif; | ||
| font-size: 14px; | ||
| color: #17191C; | ||
| } | ||
|
|
||
| header { | ||
| max-width: 480px; | ||
| width: 100%; | ||
| margin: 24px auto; | ||
| text-align: center; | ||
| } | ||
|
|
||
| header p { | ||
| color: #737D8C; | ||
| line-height: 24px; | ||
| } | ||
|
|
||
| h1 { | ||
| font-size: 24px; | ||
| } | ||
|
|
||
| h2 { | ||
| font-size: 14px; | ||
| } | ||
|
|
||
| h2 img { | ||
| vertical-align: middle; | ||
| margin-right: 8px; | ||
| width: 24px; | ||
| height: 24px; | ||
| } | ||
|
|
||
| label { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| main { | ||
| max-width: 360px; | ||
| width: 100%; | ||
| margin: 24px auto; | ||
| } | ||
|
|
||
| .primary-button { | ||
| border: none; | ||
| text-decoration: none; | ||
| padding: 12px; | ||
| color: white; | ||
| background-color: #418DED; | ||
| font-weight: bold; | ||
| display: block; | ||
| border-radius: 12px; | ||
| width: 100%; | ||
| margin: 16px 0; | ||
| cursor: pointer; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .profile { | ||
| display: flex; | ||
| justify-content: center; | ||
| margin: 24px 0; | ||
| } | ||
|
|
||
| .profile .avatar { | ||
| width: 36px; | ||
| height: 36px; | ||
| border-radius: 100%; | ||
| display: block; | ||
| margin-right: 8px; | ||
| } | ||
|
|
||
| .profile .display-name { | ||
| font-weight: bold; | ||
| margin-bottom: 4px; | ||
| } | ||
| .profile .user-id { | ||
| color: #737D8C; | ||
| } | ||
|
|
||
| .profile .display-name, .profile .user-id { | ||
| line-height: 18px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,34 @@ | |
| <head> | ||
| <meta charset="UTF-8"> | ||
| <title>SSO redirect confirmation</title> | ||
| <meta name="viewport" content="width=device-width, user-scalable=no"> | ||
| <style type="text/css"> | ||
| {% include "sso.css" without context %} | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <!-- {% if new_user %} --> | ||
| <h1>Your account is now ready</h1> | ||
| <p>You've made your account on {{ server_name | e }}.</p> | ||
|
There was a problem hiding this comment. With autoescape on I don't think we should be manually escaping these as it is confusing (although it shouldn't cause an error). (Or is #9200 not on the social login branch?) There was a problem hiding this comment.
yup, that, I'm afraid. |
||
| <!-- {% else %} --> | ||
| <h1>Log in</h1> | ||
| <!-- {% endif %} --> | ||
| <p>Continue to confirm you trust <strong>{{ display_url | e }}</strong>.</p> | ||
| </header> | ||
| <main> | ||
| <!-- {% if user_profile.avatar_url and user_profile.display_name %} --> | ||
|
There was a problem hiding this comment. Should this code account for having only a display name and not an avatar? There was a problem hiding this comment. the design is not to show this section at all if we don't have an avatar (which we never will, currently). That said, it ought to account for having an avatar and not a display name... |
||
| <div class="profile"> | ||
| <img src="{{ user_profile.avatar_url | mxc_to_http(64, 64) }}" class="avatar" /> | ||
| <div class="profile-details"> | ||
| <!-- {% if user_profile.display_name %} --> | ||
| <div class="display-name">{{ user_profile.display_name | e }}</div> | ||
| <!-- {% endif %} --> | ||
| <div class="user-id">{{ user_id | e }}</div> | ||
| </div> | ||
| </div> | ||
| <!-- {% endif %} --> | ||
| <a href="{{ redirect_url | e }}" class="primary-button"/>Continue</a> | ||
| </main> | ||
| </body> | ||
| </html> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why putting this in HTML comment tags?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to make it it easier to develop outside the template engine, I believe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've never seen this pattern before. What makes it easier to develop without these? We don't seem to do this in any other templates. Personally I find it makes my eyes ignore the Jinja logic.