-
Notifications
You must be signed in to change notification settings - Fork 523
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix bug 1335331 - Enable users to change their email address #793
Changes from 14 commits
8ee9a1d
6f1e755
fe26247
18ed578
9a3829e
3b360cb
bec393a
64ac44a
3fa8e18
3b25d3b
021eeef
e61b893
06fc386
05602c8
0747dae
dde7dfc
0400924
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
} | ||
|
||
a.avatar { | ||
display: inline-block; | ||
display: block; | ||
position: relative; | ||
} | ||
|
||
|
@@ -33,57 +33,46 @@ a.avatar:hover .desc ~ img { | |
#username { | ||
color: #EBEBEB; | ||
font-size: 48px; | ||
letter-spacing: -2px; | ||
text-transform: none; | ||
} | ||
|
||
#username .uneditable { | ||
letter-spacing: normal; | ||
padding: 8px 0 20px; | ||
text-transform: none; | ||
} | ||
|
||
#username .container { | ||
display: inline-block; | ||
#profile-form { | ||
display: block; | ||
position: relative; | ||
text-align: left; | ||
margin: 0 auto 70px auto; | ||
width: 620px; | ||
} | ||
#profile-form .field { | ||
margin-top: 20px; | ||
text-align: left; | ||
} | ||
|
||
#username .container input { | ||
background: transparent; | ||
border-bottom: 1px dashed transparent; | ||
#profile-form .field input { | ||
color: #FFFFFF; | ||
font-size: 48px; | ||
font-weight: 300; | ||
padding: 4px 50px; | ||
text-align: center; | ||
width: 100%; | ||
background: #333941; | ||
border: 1px solid #4d5967; | ||
border-radius: 3px; | ||
float: none; | ||
width: 290px; | ||
padding: 4px; | ||
|
||
-moz-box-sizing: border-box; | ||
box-sizing: border-box; | ||
} | ||
|
||
#username .container input:hover, | ||
#username .container input:focus { | ||
border-color: #888888; | ||
} | ||
|
||
#username .container .submit { | ||
bottom: -8px; | ||
color: #888888; | ||
opacity: 0; | ||
padding: 20px 0; | ||
position: absolute; | ||
right: 0; | ||
/* Needed or click doesn't trigger */ | ||
transition: all 0.1s ease-out; | ||
#profile-form button { | ||
margin-top: 10px; | ||
} | ||
|
||
#username .container input:focus + .submit { | ||
cursor: pointer; | ||
opacity: 1; | ||
#email-warning { | ||
display: none; | ||
margin-top: 5px; | ||
color: red; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's use Pontoon red here - And let's apply the same style (margin + color) to the |
||
} | ||
|
||
#username .container input:focus + .submit:hover { | ||
color: #7BC876; | ||
#id_email:focus + span{ | ||
display: block; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
} | ||
|
||
.info { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,12 +21,7 @@ | |
<img class="rounded" src="{{ user.gravatar_url(200) }}"> | ||
</a> | ||
|
||
<h2 id="username"> | ||
<div class="container"> | ||
<input type="text" placeholder="What's your name?" value="{{ user.first_name }}" maxlength="30"> | ||
<div class="submit fa fa-arrow-circle-right"></div> | ||
</div> | ||
</h2> | ||
<h2 id="username">{{ user.first_name }}</h2> | ||
|
||
<ul class="info"> | ||
{{ Checkbox.checkbox('Quality checks', class='quality-checks', attribute='quality_checks', is_enabled=user.profile.quality_checks, title='Run quality checks before submitting translations') }} | ||
|
@@ -49,13 +44,31 @@ <h2 id="username"> | |
{% csrf_token %} | ||
<input type="hidden" name="return_url" value="{{ return_url(request) }}"> | ||
|
||
<div id="profile-form"> | ||
<h3>Personal infomation</h3> | ||
<div class="field"> | ||
{{ profile_form.first_name.label_tag(label_suffix='') }} | ||
{{ profile_form.first_name }} | ||
{{ profile_form.first_name.errors }} | ||
</div> | ||
<div class="field"> | ||
{{ profile_form.email.label_tag(label_suffix='') }} | ||
{{ profile_form.email }} | ||
{{ profile_form.email.errors }} | ||
<span id="email-warning"> | ||
Caution: Changing your email address will cause a logout.<br / /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
Make sure the new one is correct before saving! | ||
</span> | ||
</div> | ||
</div> | ||
|
||
<h3>Preferred locales <span class="small stress">(to get suggestions from)</span></h3> | ||
|
||
{{ multiple_locale_selector.render(available_locales, selected_locales, form_field='locales_order', sortable=True) }} | ||
|
||
<div class="controls"> | ||
<a class="cancel" href="{{ return_url(request) }}">Cancel</a> | ||
<button class="button active">Save</button> | ||
<button class="submit button active">Save</button> | ||
</div> | ||
</form> | ||
</section> | ||
|
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.
Separate CSS rules with a blank line.