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

bootstrap: Remove bootstrap.btn classes from support view buttons. 

Moves CSS styles for support view buttons to
`web/styles/portico.activity.css`.

Also removed the "sea-green" and "small" classes from a few buttons
as no CSS rules were being applied and most of those buttons will
be removed when these forms are refactored to use a modal.
This commit is contained in:
Lauryn Menard 2024-01-29 12:03:35 +01:00 committed by Tim Abbott
parent 93198a19ed
commit 15ba9cf8ec
6 changed files with 97 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/analytics/current_plan_forms_support.html
View File

@ -6,7 +6,7 @@
<option value="charge_automatically" {% if current_plan.charge_automatically %}selected{% endif %}>Charge automatically</option>
<option value="send_invoice" {% if not current_plan.charge_automatically %}selected{% endif %}>Pay by invoice</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
{% if current_plan.end_date and current_plan.status == current_plan.ACTIVE %}
@ -15,7 +15,7 @@
{{ csrf_input }}
<input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
<input type="date" name="plan_end_date" value="{{ current_plan.end_date.strftime('%Y-%m-%d') }}" required />
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
{% endif %}
@ -29,5 +29,5 @@
<option value="downgrade_now_without_additional_licenses">Downgrade now without creating additional invoices</option>
<option value="downgrade_now_void_open_invoices">Downgrade now and void open invoices</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Modify</button>
<button type="submit" class="support-submit-button">Modify</button>
</form>

22
templates/analytics/realm_details.html
View File

@ -38,14 +38,14 @@
<option value="active" {% if not realm.deactivated %}selected{% endif %}>Active</option>
<option value="deactivated" {% if realm.deactivated %}selected{% endif %}>Deactivated</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
<form method="POST">
<b>New subdomain</b>:<br />
{{ csrf_input }}
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
<input type="text" name="new_subdomain" required />
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
<form method="POST">
<b>Org type</b>:<br />
@ -58,7 +58,7 @@
</option>
{% endfor %}
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
<form method="POST" class="support-plan-type-form">
<b>Plan type</b>:<br />
@ -71,7 +71,7 @@
<option value="4" {% if realm.plan_type == 4 %}selected{% endif %}>Standard Free</option>
<option value="10" {% if realm.plan_type == 10 %}selected{% endif %}>Plus</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
<form method="POST" class="sponsorship-pending-form">
<b>Sponsorship pending</b>:<br />
@ -81,7 +81,7 @@
<option value="true" {% if plan_data[realm.id].customer and plan_data[realm.id].customer.sponsorship_pending %}selected{% endif %}>Yes</option>
<option value="false" {% if not plan_data[realm.id].customer or not plan_data[realm.id].customer.sponsorship_pending %}selected{% endif %}>No</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
{% if plan_data[realm.id].customer and plan_data[realm.id].customer.sponsorship_pending %}
@ -89,7 +89,7 @@
{{ csrf_input }}
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
<input type="hidden" name="approve_sponsorship" value="true" />
<button class="btn btn-default sea-green small approve-sponsorship-button">
<button class="approve-sponsorship-button">
Approve full sponsorship
</button>
(will email organization owners).
@ -102,10 +102,10 @@
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
{% if plan_data[realm.id].current_plan and plan_data[realm.id].current_plan.fixed_price %}
<input type="number" name="discount" value="{{ format_discount(get_discount(plan_data[realm.id].customer)) }}" step="0.01" min="0" max="99.99" disabled />
<button type="submit" class="btn btn-default support-submit-button" disabled>Update</button>
<button type="submit" class="support-submit-button" disabled>Update</button>
{% else %}
<input type="number" name="discount" value="{{ format_discount(get_discount(plan_data[realm.id].customer)) }}" step="0.01" min="0" max="99.99" required />
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
{% endif %}
</form>
@ -128,7 +128,7 @@
<option value="charge_automatically" {% if plan_data[realm.id].current_plan.charge_automatically %}selected{% endif %}>Charge automatically</option>
<option value="send_invoice" {% if not plan_data[realm.id].current_plan.charge_automatically %}selected{% endif %}>Pay by invoice</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
<form method="POST" class="downgrade-plan-form">
@ -143,7 +143,7 @@
<option value="downgrade_now_void_open_invoices">Downgrade now and void open invoices</option>
<option value="upgrade_plan_tier">Upgrade to the Plus plan</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Modify</button>
<button type="submit" class="support-submit-button">Modify</button>
</form>
{% endif %}
@ -153,5 +153,5 @@
{{ csrf_input }}
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
<input type="hidden" name="scrub_realm" value="true" />
<button data-string-id="{{realm.string_id}}" class="btn btn-danger small scrub-realm-button">Scrub realm (danger)</button>
<button data-string-id="{{realm.string_id}}" class="scrub-realm-button">Scrub realm (danger)</button>
</form>

2
templates/analytics/remote_server_support.html
View File

@ -14,7 +14,7 @@
<form>
<center>
<input type="text" name="q" class="input-xxlarge search-query" placeholder="hostname or contact email" value="{{ request.GET.get('q', '') }}" autofocus />
<button type="submit" class="btn btn-default support-search-button">Search</button>
<button type="submit" class="support-search-button">Search</button>
</center>
</form>

12
templates/analytics/sponsorship_forms_support.html
View File

@ -6,7 +6,7 @@
<option value="true" {% if sponsorship_data.sponsorship_pending %}selected{% endif %}>Yes</option>
<option value="false" {% if not sponsorship_data.sponsorship_pending %}selected{% endif %}>No</option>
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
{% if sponsorship_data.sponsorship_pending %}
@ -14,7 +14,7 @@
{{ csrf_input }}
<input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
<input type="hidden" name="approve_sponsorship" value="true" />
<button class="btn btn-default sea-green small approve-sponsorship-button">
<button class="approve-sponsorship-button">
Approve full sponsorship
</button>
</form>
@ -28,10 +28,10 @@
<input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
{% if has_fixed_price %}
<input type="number" name="discount" value="{{ format_discount(sponsorship_data.default_discount) }}" step="0.01" min="0" max="99.99" disabled />
<button type="submit" class="btn btn-default support-submit-button" disabled>Update</button>
<button type="submit" class="support-submit-button" disabled>Update</button>
{% else %}
<input type="number" name="discount" value="{{ format_discount(sponsorship_data.default_discount) }}" step="0.01" min="0" max="99.99" required />
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
{% endif %}
</form>
@ -41,7 +41,7 @@
{{ csrf_input }}
<input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
<input type="number" name="minimum_licenses" value="{{ sponsorship_data.minimum_licenses }}" required />
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
{% endif %}
@ -59,7 +59,7 @@
{% endif %}
{% endfor %}
</select>
<button type="submit" class="btn btn-default support-submit-button">Update</button>
<button type="submit" class="support-submit-button">Update</button>
</form>
{% if sponsorship_data.sponsorship_pending %}

4
templates/analytics/support.html
View File

@ -13,7 +13,7 @@
<form>
<center>
<input type="text" name="q" class="input-xxlarge search-query" placeholder="full names, emails, string_ids, organization URLs separated by commas" value="{{ request.GET.get('q', '') }}" autofocus />
<button type="submit" class="btn btn-default support-search-button">Search</button>
<button type="submit" class="support-search-button">Search</button>
</center>
</form>
@ -45,7 +45,7 @@
{{ csrf_input }}
<input type="hidden" name="realm_id" value="{{ realm.id }}" />
<input type="hidden" name="delete_user_by_id" value="{{ user.id }}" />
<button data-email="{{ user.delivery_email }}" data-string-id="{{ realm.string_id }}" class="btn btn-danger small delete-user-button">Delete user (danger)</button>
<button data-email="{{ user.delivery_email }}" data-string-id="{{ realm.string_id }}" class="delete-user-button">Delete user (danger)</button>
</form>
<hr />
<div>

81
web/styles/portico/activity.css
View File

@ -170,6 +170,80 @@ tr.admin td:first-child {
}
}
.approve-sponsorship-button,
.support-search-button,
.support-submit-button,
.delete-user-button,
.scrub-realm-button {
padding: 6px 12px;
display: inline-block;
margin-bottom: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 1.4286;
text-align: center;
white-space: nowrap;
vertical-align: middle;
cursor: pointer;
user-select: none;
background-image: none;
&:hover,
&:focus {
text-decoration: none;
}
&:focus {
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
&:active {
background-image: none;
outline: 0;
}
&[disabled] {
pointer-events: none;
cursor: not-allowed;
opacity: 0.65;
}
}
.approve-sponsorship-button,
.support-search-button,
.support-submit-button {
color: hsl(0deg 0% 20%);
background-color: hsl(0deg 0% 100%);
border: 1px solid hsl(0deg 0% 83%);
border-radius: 2px;
&:hover,
&:focus,
&:active {
color: hsl(0deg 0% 20%);
background-color: hsl(0deg 0% 92%);
border: 1px solid hsl(0deg 0% 68%);
}
}
.delete-user-button,
.scrub-realm-button {
color: hsl(0deg 0% 100%);
background-color: hsl(2deg 64% 58%);
border: 1px solid hsl(2deg 64% 53%);
border-radius: 2px;
&:hover,
&:focus,
&:active {
color: hsl(0deg 0% 100%);
background-color: hsl(2deg 65% 50%);
border: 1px solid hsl(2deg 65% 41%);
}
}
.remote-server-information,
.remote-realm-information {
padding-bottom: 15px;
@ -234,16 +308,9 @@ tr.admin td:first-child {
top: -70px;
}
.support-search-button {
border-color: hsl(0deg 0% 83%);
border-radius: 2px;
}
.support-submit-button {
position: relative;
top: -3px;
border-color: hsl(0deg 0% 83%);
border-radius: 2px;
}
.search-query.input-xxlarge {