-
Notifications
You must be signed in to change notification settings - Fork 531
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1666 from mstriemer/mobile-fxa-login-1660
Mobile FxA login form (fixes #1660)
- Loading branch information
Showing
14 changed files
with
122 additions
and
70 deletions.
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
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
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
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
15 changes: 15 additions & 0 deletions
15
src/olympia/users/templates/users/fxa_migration_prompt_content.html
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,15 @@ | ||
<img alt="{{ request.APP.pretty }}" src="{{ static('img/icons/firefox.png')|safe }}" class="firefox-logo"> | ||
<p> | ||
{% trans %} | ||
Mozilla Add-ons has transitioned to Firefox Accounts for login. | ||
Continue to complete the simple upgrade process. | ||
{% endtrans %} | ||
</p> | ||
<div class="migrate-button"> | ||
<a href="{{ url('users.login') }}" class="fxa-login button prominent"> | ||
{{ _('Continue') }} | ||
</a> | ||
</div> | ||
<div class="skip-migrate-link"> | ||
<a href="{{ to }}">{{ _('Skip') }}</a> | ||
</a> |
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
11 changes: 11 additions & 0 deletions
11
src/olympia/users/templates/users/mobile/fxa_migration.html
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,11 @@ | ||
{% extends "mobile/base.html" %} | ||
|
||
{% block title %}{{ page_title(_('Migrate to Firefox Accounts')) }}{% endblock %} | ||
|
||
{% block page %} | ||
|
||
<div class="primary fxa-migration-prompt" role="main"> | ||
<h2>{{ _('Migrate to Firefox Accounts') }}</h2> | ||
{% include 'users/fxa_migration_prompt_content.html' %} | ||
</div> | ||
{% endblock page %} |
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
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
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
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
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
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,17 @@ | ||
.notification-box { | ||
line-height: 1.25; | ||
margin: 10px 0; | ||
padding: 10px; | ||
|
||
h2 { | ||
font-size: 20px; | ||
} | ||
p { | ||
font-size: 18px; | ||
margin-top: 10px; | ||
} | ||
} | ||
.notification-box.error { | ||
background-color: #FFA5A5; | ||
color: #444; | ||
} |
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