Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "login: Fix alignment of error message in login form." 

This reverts commit 6fe82620df.

Reverted since this misaligns other forms which use the same
class.
This commit is contained in:
Aman Agrawal 2020-10-17 14:53:27 +05:30 committed by Tim Abbott
parent 178e0b7d47
commit 8297121050
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
static/styles/portico/portico-signin.css
View File

@ -402,6 +402,7 @@ html {
input[type="email"],
input[type="password"] {
padding: 10px 32px 10px 12px;
margin: 25px 0 5px;
font-family: "Source Sans Pro";
font-size: 1.2rem;
@ -426,6 +427,20 @@ html {
}
}
input[type="email"] {
margin-bottom: 10px;
}
label {
position: absolute;
top: 0;
left: 0;
margin-top: 1px;
transition: all 0.3s ease;
}
&.moving-label {
input[type="text"]:invalid + label,
input[type="email"]:invalid + label,
@ -471,8 +486,8 @@ html {
label.text-error {
display: block;
position: relative;
top: -8px;
top: 66px;
color: hsl(0, 54%, 61%);
font-size: 0.7em;
font-weight: 600;

10
templates/zerver/login.html
View File

@ -52,6 +52,10 @@ page can be easily identified in it's respective JavaScript file. -->
<!-- .no-validation is for removing the red star in CSS -->
{% if not two_factor_authentication_enabled or wizard.steps.current == 'auth' %}
<div class="input-box no-validation">
<input id="id_username" type="{% if not require_email_format_usernames %}text{% else %}email{% endif %}"
name="username" class="{% if require_email_format_usernames %}email {% endif %}required"
{% if email %} value="{{ email }}" {% else %} value="" autofocus {% endif %}
maxlength="72" required />
<label for="id_username">
{% if not require_email_format_usernames and email_auth_enabled %}
{{ _('Email or username') }}
@ -61,17 +65,13 @@ page can be easily identified in it's respective JavaScript file. -->
{{ _('Email') }}
{% endif %}
</label>
<input id="id_username" type="{% if not require_email_format_usernames %}text{% else %}email{% endif %}"
name="username" class="{% if require_email_format_usernames %}email {% endif %}required"
{% if email %} value="{{ email }}" {% else %} value="" autofocus {% endif %}
maxlength="72" required />
</div>
<div class="input-box no-validation">
<label for="id_password" class="control-label">{{ _('Password') }}</label>
<input id="id_password" name="password" class="required" type="password"
{% if email %} autofocus {% endif %}
required />
<label for="id_password" class="control-label">{{ _('Password') }}</label>
</div>
{% else %}
{% include "two_factor/_wizard_forms.html" %}