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

portico: Remove usage of `control-group` and `control-label` class.

This commit is contained in:
Ganesh Pawar 2022-08-12 22:25:01 +05:30 committed by Tim Abbott
parent eae3e1c3cc
commit f6f85f98a7
5 changed files with 86 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
static/styles/portico/portico.css
View File

@ -854,11 +854,7 @@ input.new-organization-button {
.login-form, .login-form,
.register-form { .register-form {
.control-label { .controls {
margin-bottom: 2px;
}
.control-group {
margin-right: 10px; margin-right: 10px;
} }
} }
@ -924,10 +920,6 @@ input.new-organization-button {
margin-top: 20px; margin-top: 20px;
} }
.control-group .control-label {
display: block;
}
.pitch { .pitch {
width: auto; width: auto;
} }
@ -1018,6 +1010,17 @@ input.new-organization-button {
text-align: center; text-align: center;
} }
#registration-email {
label {
float: left;
padding-top: 5px;
width: 100%;
display: block;
margin: 0;
text-align: left;
}
}
.center-block { .center-block {
text-align: left; text-align: left;
display: inline-block; display: inline-block;
@ -1027,20 +1030,9 @@ input.new-organization-button {
margin-bottom: 20px; margin-bottom: 20px;
} }
.control-group { .controls {
margin-bottom: 10px; margin: 0;
text-align: left;
label {
width: 100%;
display: block;
margin: 0;
text-align: left;
}
.controls {
margin: 0;
text-align: left;
}
} }
#send_confirm input[type="text"] { #send_confirm input[type="text"] {

2
static/styles/portico/portico_signin.css
View File

@ -303,7 +303,7 @@ html {
.center-block { .center-block {
max-width: 800px; max-width: 800px;
.control-group { .controls {
margin-bottom: 5px; margin-bottom: 5px;
} }
} }

12
templates/zerver/accounts_accept_terms.html
View File

@ -16,8 +16,8 @@ the registration flow has its own (nearly identical) copy of the fields below in
<div class="form-horizontal white-box"> <div class="form-horizontal white-box">
<form method="post" class="form-horizontal" id="registration" action="{{ url('accept_terms') }}"> <form method="post" class="form-horizontal" id="registration" action="{{ url('accept_terms') }}">
{{ csrf_input }} {{ csrf_input }}
<div class="control-group"> <div id="registration-email">
<label for="id_email" class="control-label">{{ _("Email") }}</label> <label for="id_email">{{ _("Email") }}</label>
<div class="controls fakecontrol"> <div class="controls fakecontrol">
<p>{{ email }}</p> <p>{{ email }}</p>
</div> </div>
@ -52,11 +52,9 @@ the registration flow has its own (nearly identical) copy of the fields below in
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div> </div>
<div class="control-group"> <div class="controls">
<div class="controls"> <button id="accept_tos_button" type="submit">{{ _('Accept') }}</button>
<button id="accept_tos_button" type="submit">{{ _('Accept') }}</button> <input type="hidden" name="next" value="{{ next }}" />
<input type="hidden" name="next" value="{{ next }}" />
</div>
</div> </div>
</form> </form>
</div> </div>

130
templates/zerver/development/dev_login.html
View File

@ -16,75 +16,73 @@ page can be easily identified in it's respective JavaScript file -->
<p class="devlogin_subheader">(Or visit the <a href="/login/">normal login page</a>.)</p> <p class="devlogin_subheader">(Or visit the <a href="/login/">normal login page</a>.)</p>
<form name="direct_login_form" id="direct_login_form" method="post" class="login-form"> <form name="direct_login_form" id="direct_login_form" method="post" class="login-form">
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
<div class="control-group"> <div class="controls">
<div class="controls"> <div class="group">
<div class="group"> {% if realm_web_public_access_enabled %}
{% if realm_web_public_access_enabled %} <h2>{{_('Anonymous user') }}</h2>
<h2>{{_('Anonymous user') }}</h2> <p>
<input type="submit" formaction="{{ current_realm.uri }}{{ url('login-local') }}"
name="prefers_web_public_view" class="btn-direct btn-admin" value="Anonymous login" />
</p>
{% endif %}
<h2>{{_('Owners') }}</h2>
{% if direct_owners %}
{% for direct_owner in direct_owners %}
<p> <p>
<input type="submit" formaction="{{ current_realm.uri }}{{ url('login-local') }}" <input type="submit" formaction="{{ direct_owner.realm.uri }}{{ url('login-local') }}"
name="prefers_web_public_view" class="btn-direct btn-admin" value="Anonymous login" /> name="direct_email" class="btn-direct btn-admin" value="{{ direct_owner.delivery_email }}" />
</p> </p>
{% endif %} {% endfor %}
<h2>{{_('Owners') }}</h2> {% else %}
{% if direct_owners %} <p>No owners found in this realm</p>
{% for direct_owner in direct_owners %} {% endif %}
<p> <h2>{{ _('Administrators') }}</h2>
<input type="submit" formaction="{{ direct_owner.realm.uri }}{{ url('login-local') }}" {% if direct_admins %}
name="direct_email" class="btn-direct btn-admin" value="{{ direct_owner.delivery_email }}" /> {% for direct_admin in direct_admins %}
</p> <p>
{% endfor %} <input type="submit" formaction="{{ direct_admin.realm.uri }}{{ url('login-local') }}"
{% else %} name="direct_email" class="btn-direct btn-admin" value="{{ direct_admin.delivery_email }}" />
<p>No owners found in this realm</p> </p>
{% endif %} {% endfor %}
<h2>{{ _('Administrators') }}</h2> {% else %}
{% if direct_admins %} <p>No administrators found in this realm</p>
{% for direct_admin in direct_admins %} {% endif %}
<p> <h2>{{ _('Moderators') }}</h2>
<input type="submit" formaction="{{ direct_admin.realm.uri }}{{ url('login-local') }}" {% if direct_moderators %}
name="direct_email" class="btn-direct btn-admin" value="{{ direct_admin.delivery_email }}" /> {% for direct_moderator in direct_moderators %}
</p> <p>
{% endfor %} <input type="submit" formaction="{{ direct_moderator.realm.uri }}{{ url('login-local') }}"
{% else %} name="direct_email" class="btn-direct btn-admin" value="{{ direct_moderator.delivery_email }}" />
<p>No administrators found in this realm</p> </p>
{% endif %} {% endfor %}
<h2>{{ _('Moderators') }}</h2> {% else %}
{% if direct_moderators %} <p>No moderators found in this realm</p>
{% for direct_moderator in direct_moderators %} {% endif %}
<p> <h2>{{ _('Guest users') }}</h2>
<input type="submit" formaction="{{ direct_moderator.realm.uri }}{{ url('login-local') }}" {% if guest_users %}
name="direct_email" class="btn-direct btn-admin" value="{{ direct_moderator.delivery_email }}" /> {% for guest_user in guest_users %}
</p> <p>
{% endfor %} <input type="submit" formaction="{{ guest_user.realm.uri }}{{ url('login-local') }}"
{% else %} name="direct_email" class="btn-direct btn-admin" value="{{ guest_user.delivery_email }}" />
<p>No moderators found in this realm</p> </p>
{% endif %} {% endfor %}
<h2>{{ _('Guest users') }}</h2> {% else %}
{% if guest_users %} <p>No guest users found in this realm</p>
{% for guest_user in guest_users %} {% endif %}
<p> </div>
<input type="submit" formaction="{{ guest_user.realm.uri }}{{ url('login-local') }}"
name="direct_email" class="btn-direct btn-admin" value="{{ guest_user.delivery_email }}" />
</p>
{% endfor %}
{% else %}
<p>No guest users found in this realm</p>
{% endif %}
</div>
<div class="group"> <div class="group">
<h2>{{ _('Normal users') }}</h2> <h2>{{ _('Normal users') }}</h2>
{% if direct_users %} {% if direct_users %}
{% for direct_user in direct_users %} {% for direct_user in direct_users %}
<p> <p>
<input type="submit" formaction="{{ direct_user.realm.uri }}{{ url('login-local') }}" <input type="submit" formaction="{{ direct_user.realm.uri }}{{ url('login-local') }}"
name="direct_email" class="btn-direct btn-admin" value="{{ direct_user.delivery_email }}" /> name="direct_email" class="btn-direct btn-admin" value="{{ direct_user.delivery_email }}" />
</p> </p>
{% endfor %} {% endfor %}
{% else %} {% else %}
<p>No normal users found in this realm</p> <p>No normal users found in this realm</p>
{% endif %} {% endif %}
</div>
</div> </div>
</div> </div>
</form> </form>

2
templates/zerver/login.html
View File

@ -90,7 +90,7 @@ page can be easily identified in it's respective JavaScript file. -->
<input id="id_password" name="password" class="required" type="password" autocomplete="off" <input id="id_password" name="password" class="required" type="password" autocomplete="off"
{% if email %} autofocus {% endif %} {% if email %} autofocus {% endif %}
required /> required />
<label for="id_password" class="control-label">{{ _('Password') }}</label> <label for="id_password">{{ _('Password') }}</label>
<i class="fa fa-eye-slash password_visibility_toggle" role="button"></i> <i class="fa fa-eye-slash password_visibility_toggle" role="button"></i>
</div> </div>
{% else %} {% else %}