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

bootstrap: Rename btn-* -> button-* classes. 

This commit is a part of the efforts to rename btn-related classes
and variables to align with Zulip's no-abbreviations policy and
streamline the search results.
This commit is contained in:
Sayam Samal 2024-11-14 16:34:50 +05:30 committed by Tim Abbott
parent 045efadab9
commit 543a6c51dc
29 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/settings_invites.ts
View File

@ -226,7 +226,7 @@ function do_resend_invite({$row, invite_id}: {$row: JQuery; invite_id: string}):
dialog_widget.close(); dialog_widget.close();
$resend_button.prop("disabled", true); $resend_button.prop("disabled", true);
$resend_button.text($t({defaultMessage: "Sent!"})); $resend_button.text($t({defaultMessage: "Sent!"}));
$resend_button.removeClass("resend btn-warning").addClass("sea-green"); $resend_button.removeClass("resend button-warning").addClass("sea-green");
}, },
}); });
} }

8
web/src/settings_users.ts
View File

@ -119,8 +119,8 @@ export function update_view_on_deactivate(user_id: number): void {
const $button = $row.find("button.deactivate"); const $button = $row.find("button.deactivate");
$button.prop("disabled", false); $button.prop("disabled", false);
$row.find("i.deactivated-user-icon").show(); $row.find("i.deactivated-user-icon").show();
$button.addClass("btn-warning reactivate"); $button.addClass("button-warning reactivate");
$button.removeClass("deactivate btn-danger"); $button.removeClass("deactivate button-danger");
$button.empty().append($("<i>").addClass(["fa", "fa-user-plus"]).attr("aria-hidden", "true")); $button.empty().append($("<i>").addClass(["fa", "fa-user-plus"]).attr("aria-hidden", "true"));
$row.removeClass("active-user"); $row.removeClass("active-user");
$row.addClass("deactivated_user"); $row.addClass("deactivated_user");
@ -137,8 +137,8 @@ export function update_view_on_reactivate(user_id: number): void {
const $button = $row.find("button.reactivate"); const $button = $row.find("button.reactivate");
$row.find("i.deactivated-user-icon").hide(); $row.find("i.deactivated-user-icon").hide();
$button.addClass("btn-danger deactivate"); $button.addClass("button-danger deactivate");
$button.removeClass("btn-warning reactivate"); $button.removeClass("button-warning reactivate");
$button.empty().append($("<i>").addClass(["fa", "fa-user-times"]).attr("aria-hidden", "true")); $button.empty().append($("<i>").addClass(["fa", "fa-user-times"]).attr("aria-hidden", "true"));
$row.removeClass("deactivated_user"); $row.removeClass("deactivated_user");
$row.addClass("active-user"); $row.addClass("active-user");

2
web/src/user_group_edit.js
View File

@ -1022,7 +1022,7 @@ export function initialize() {
}); });
}); });
$("#groups_overlay_container").on("click", ".group_settings_header .btn-danger", () => { $("#groups_overlay_container").on("click", ".group_settings_header .button-danger", () => {
const active_group_data = get_active_data(); const active_group_data = get_active_data();
const group_id = active_group_data.id; const group_id = active_group_data.id;
const user_group = user_groups.get_user_group_from_id(group_id); const user_group = user_groups.get_user_group_from_id(group_id);

4
web/styles/app_components.css
View File

@ -222,7 +222,7 @@ input::placeholder {
} }
} }
&.btn-warning { &.button-warning {
color: hsl(35deg 70% 56%); color: hsl(35deg 70% 56%);
border-color: hsl(35deg 98% 84%); border-color: hsl(35deg 98% 84%);
@ -237,7 +237,7 @@ input::placeholder {
} }
} }
&.btn-danger { &.button-danger {
color: hsl(357deg 64% 72%); color: hsl(357deg 64% 72%);
border-color: hsl(4deg 56% 82%); border-color: hsl(4deg 56% 82%);

2
web/styles/message_row.css
View File

@ -743,7 +743,7 @@ of the base style defined for a read-only textarea in dark mode. */
} }
.edit-controls { .edit-controls {
.btn-wrapper { .button-wrapper {
cursor: not-allowed; cursor: not-allowed;
} }
} }

2
web/templates/poll_modal_option.hbs
View File

@ -1,7 +1,7 @@
<li class="option-row"> <li class="option-row">
<i class="zulip-icon zulip-icon-grip-vertical drag-icon"></i> <i class="zulip-icon zulip-icon-grip-vertical drag-icon"></i>
<input type="text" class="poll-option-input modal_text_input" placeholder="{{t 'New option' }}" /> <input type="text" class="poll-option-input modal_text_input" placeholder="{{t 'New option' }}" />
<button type="button" class="button rounded small btn-secondary delete-option" title="{{t 'Delete' }}"> <button type="button" class="button rounded small button-secondary delete-option" title="{{t 'Delete' }}">
<i class="fa fa-trash-o" aria-hidden="true"></i> <i class="fa fa-trash-o" aria-hidden="true"></i>
</button> </button>
</li> </li>

2
web/templates/recent_view_table.hbs
View File

@ -1,4 +1,4 @@
<div id="recent_view_filter_buttons" class="btn-group" role="group"> <div id="recent_view_filter_buttons" class="button-group" role="group">
<div id="recent_filters_group"> <div id="recent_filters_group">
{{> recent_view_filters}} {{> recent_view_filters}}
</div> </div>

4
web/templates/settings/account_settings.hbs
View File

@ -52,13 +52,13 @@
<div class="input-group"> <div class="input-group">
<div id="deactivate_account_container" class="inline-block {{#if user_is_only_organization_owner}}disabled_setting_tooltip{{/if}}"> <div id="deactivate_account_container" class="inline-block {{#if user_is_only_organization_owner}}disabled_setting_tooltip{{/if}}">
<button type="submit" class="button rounded btn-danger" id="user_deactivate_account_button" <button type="submit" class="button rounded button-danger" id="user_deactivate_account_button"
{{#if user_is_only_organization_owner}}disabled="disabled"{{/if}}> {{#if user_is_only_organization_owner}}disabled="disabled"{{/if}}>
{{t 'Deactivate account' }} {{t 'Deactivate account' }}
</button> </button>
</div> </div>
{{#if owner_is_only_user_in_organization}} {{#if owner_is_only_user_in_organization}}
<button type="submit" class="button rounded btn-danger deactivate_realm_button"> <button type="submit" class="button rounded button-danger deactivate_realm_button">
{{t 'Deactivate organization' }} {{t 'Deactivate organization' }}
</button> </button>
{{/if}} {{/if}}

2
web/templates/settings/add_new_bot_form.hbs
View File

@ -66,7 +66,7 @@
<div id="add_bot_preview_text"> <div id="add_bot_preview_text">
<img id="add_bot_preview_image" /> <img id="add_bot_preview_image" />
</div> </div>
<button class="button white rounded small btn-danger" style="display: none;" id="bot_avatar_clear_button">{{t "Clear avatar" }}</button> <button class="button white rounded small button-danger" style="display: none;" id="bot_avatar_clear_button">{{t "Clear avatar" }}</button>
<button class="button white rounded" id="bot_avatar_upload_button">{{t "Choose avatar" }}</button> ({{t "Optional" }}) <button class="button white rounded" id="bot_avatar_upload_button">{{t "Choose avatar" }}</button> ({{t "Optional" }})
</div> </div>
<p> <p>

2
web/templates/settings/admin_default_streams_list.hbs
View File

@ -6,7 +6,7 @@
</td> </td>
{{#if ../can_modify}} {{#if ../can_modify}}
<td class="actions"> <td class="actions">
<button class="button rounded remove-default-stream btn-danger"> <button class="button rounded remove-default-stream button-danger">
{{t "Remove from default" }} {{t "Remove from default" }}
</button> </button>
</td> </td>

2
web/templates/settings/admin_emoji_list.hbs
View File

@ -20,7 +20,7 @@
{{/if}} {{/if}}
</td> </td>
<td> <td>
<button class="button rounded small delete btn-danger tippy-zulip-delayed-tooltip" {{#unless can_delete_emoji}}disabled="disabled"{{/unless}} data-tippy-content="{{t 'Delete' }}" data-emoji-name="{{name}}"> <button class="button rounded small delete button-danger tippy-zulip-delayed-tooltip" {{#unless can_delete_emoji}}disabled="disabled"{{/unless}} data-tippy-content="{{t 'Delete' }}" data-emoji-name="{{name}}">
<i class="fa fa-trash-o" aria-hidden="true"></i> <i class="fa fa-trash-o" aria-hidden="true"></i>
</button> </button>
</td> </td>

2
web/templates/settings/admin_export_list.hbs
View File

@ -22,7 +22,7 @@
</td> </td>
<td class="actions"> <td class="actions">
{{#if url}} {{#if url}}
<button class="button rounded small delete btn-danger" data-export-id="{{id}}"> <button class="button rounded small delete button-danger" data-export-id="{{id}}">
<i class="fa fa-trash-o" aria-hidden="true"></i> <i class="fa fa-trash-o" aria-hidden="true"></i>
</button> </button>
{{/if}} {{/if}}

2
web/templates/settings/admin_human_form.hbs
View File

@ -29,7 +29,7 @@
<div class="input-group"> <div class="input-group">
{{#if is_active}} {{#if is_active}}
<span {{#if owner_is_only_user_in_organization}}class="deactivate_user_button_tooltip"{{/if}}> <span {{#if owner_is_only_user_in_organization}}class="deactivate_user_button_tooltip"{{/if}}>
<button class="button rounded btn-danger deactivate_user_button" {{#if owner_is_only_user_in_organization}}disabled="disabled"{{/if}}> <button class="button rounded button-danger deactivate_user_button" {{#if owner_is_only_user_in_organization}}disabled="disabled"{{/if}}>
{{t 'Deactivate user' }} {{t 'Deactivate user' }}
</button> </button>
</span> </span>

4
web/templates/settings/admin_invites_list.hbs
View File

@ -33,11 +33,11 @@
</td> </td>
<td class="actions"> <td class="actions">
{{#unless is_multiuse}} {{#unless is_multiuse}}
<button class="button rounded small resend btn-warning" {{#if disable_buttons}}disabled="disabled"{{/if}} data-invite-id="{{id}}"> <button class="button rounded small resend button-warning" {{#if disable_buttons}}disabled="disabled"{{/if}} data-invite-id="{{id}}">
{{t "Resend" }} {{t "Resend" }}
</button> </button>
{{/unless}} {{/unless}}
<button class="button rounded small revoke btn-danger" {{#if disable_buttons}}disabled="disabled"{{/if}} data-invite-id="{{id}}" data-is-multiuse="{{is_multiuse}}"> <button class="button rounded small revoke button-danger" {{#if disable_buttons}}disabled="disabled"{{/if}} data-invite-id="{{id}}" data-is-multiuse="{{is_multiuse}}">
{{t "Revoke" }} {{t "Revoke" }}
</button> </button>
</td> </td>

4
web/templates/settings/admin_linkifier_list.hbs
View File

@ -14,10 +14,10 @@
</td> </td>
{{#if ../can_modify}} {{#if ../can_modify}}
<td class="no-select actions"> <td class="no-select actions">
<button class="button small rounded edit btn-warning tippy-zulip-delayed-tooltip" data-linkifier-id="{{id}}" data-tippy-content="{{t 'Edit' }}" aria-label="{{t 'Edit' }}"> <button class="button small rounded edit button-warning tippy-zulip-delayed-tooltip" data-linkifier-id="{{id}}" data-tippy-content="{{t 'Edit' }}" aria-label="{{t 'Edit' }}">
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
</button> </button>
<button class="button small rounded delete btn-danger tippy-zulip-delayed-tooltip" data-linkifier-id="{{id}}" data-tippy-content="{{t 'Delete' }}" aria-label="{{t 'Delete' }}"> <button class="button small rounded delete button-danger tippy-zulip-delayed-tooltip" data-linkifier-id="{{id}}" data-tippy-content="{{t 'Delete' }}" aria-label="{{t 'Delete' }}">
<i class="fa fa-trash-o"></i> <i class="fa fa-trash-o"></i>
</button> </button>
</td> </td>

2
web/templates/settings/admin_playground_list.hbs
View File

@ -11,7 +11,7 @@
</td> </td>
{{#if ../can_modify}} {{#if ../can_modify}}
<td class="no-select actions"> <td class="no-select actions">
<button class="button small delete btn-danger tippy-zulip-tooltip" data-playground-id="{{id}}" data-tippy-content="{{t 'Delete' }} {{ playground_name }}" aria-label="{{t 'Delete' }} {{ playground_name }}"> <button class="button small delete button-danger tippy-zulip-tooltip" data-playground-id="{{id}}" data-tippy-content="{{t 'Delete' }} {{ playground_name }}" aria-label="{{t 'Delete' }} {{ playground_name }}">
<i class="fa fa-trash-o"></i> <i class="fa fa-trash-o"></i>
</button> </button>
</td> </td>

4
web/templates/settings/admin_profile_field_list.hbs
View File

@ -35,10 +35,10 @@
</td> </td>
{{#if ../can_modify}} {{#if ../can_modify}}
<td class="actions"> <td class="actions">
<button class="button rounded small btn-warning open-edit-form-modal tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edit' }}" data-profile-field-id="{{id}}"> <button class="button rounded small button-warning open-edit-form-modal tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edit' }}" data-profile-field-id="{{id}}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fa fa-pencil" aria-hidden="true"></i>
</button> </button>
<button class="button rounded small delete btn-danger tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Delete' }}" data-profile-field-id="{{id}}"> <button class="button rounded small delete button-danger tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Delete' }}" data-profile-field-id="{{id}}">
<i class="fa fa-trash-o" aria-hidden="true"></i> <i class="fa fa-trash-o" aria-hidden="true"></i>
</button> </button>
</td> </td>

2
web/templates/settings/admin_realm_domains_list.hbs
View File

@ -8,6 +8,6 @@
<span class="rendered-checkbox"></span> <span class="rendered-checkbox"></span>
</label> </label>
</td> </td>
<td><button class="button btn-danger small rounded delete_realm_domain">{{t "Remove" }}</button></td> <td><button class="button button-danger small rounded delete_realm_domain">{{t "Remove" }}</button></td>
</tr> </tr>
{{/with}} {{/with}}

6
web/templates/settings/admin_user_list.hbs
View File

@ -36,18 +36,18 @@
<td class="actions"> <td class="actions">
<span class="user-status-settings"> <span class="user-status-settings">
<span {{#if (and is_bot cannot_edit)}}class="tippy-zulip-tooltip"{{/if}} {{#if (and is_bot cannot_edit)}}data-tippy-content="{{t 'This bot cannot be edited.'}}"{{/if}}> <span {{#if (and is_bot cannot_edit)}}class="tippy-zulip-tooltip"{{/if}} {{#if (and is_bot cannot_edit)}}data-tippy-content="{{t 'This bot cannot be edited.'}}"{{/if}}>
<button class="button rounded small btn-warning open-user-form tippy-zulip-delayed-tooltip" data-tippy-content="{{#if is_bot}}{{#unless cannot_edit}}{{t 'Edit bot' }}{{/unless}}{{else}}{{t 'Edit user' }}{{/if}}" data-user-id="{{user_id}}" {{#if cannot_edit}}disabled="disabled"{{/if}}> <button class="button rounded small button-warning open-user-form tippy-zulip-delayed-tooltip" data-tippy-content="{{#if is_bot}}{{#unless cannot_edit}}{{t 'Edit bot' }}{{/unless}}{{else}}{{t 'Edit user' }}{{/if}}" data-user-id="{{user_id}}" {{#if cannot_edit}}disabled="disabled"{{/if}}>
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fa fa-pencil" aria-hidden="true"></i>
</button> </button>
</span> </span>
{{#if is_active}} {{#if is_active}}
<span {{#if (and is_bot cannot_deactivate)}}class="tippy-zulip-tooltip"{{/if}} {{#if (and is_bot cannot_deactivate)}}data-tippy-content="{{t 'This bot cannot be deactivated.'}}"{{/if}}> <span {{#if (and is_bot cannot_deactivate)}}class="tippy-zulip-tooltip"{{/if}} {{#if (and is_bot cannot_deactivate)}}data-tippy-content="{{t 'This bot cannot be deactivated.'}}"{{/if}}>
<button class="button rounded small btn-danger {{#unless (and is_bot cannot_deactivate) }}deactivate{{/unless}}" {{#if cannot_deactivate}}disabled="disabled"{{/if}}> <button class="button rounded small button-danger {{#unless (and is_bot cannot_deactivate) }}deactivate{{/unless}}" {{#if cannot_deactivate}}disabled="disabled"{{/if}}>
<i class="fa fa-user-times" aria-hidden="true"></i> <i class="fa fa-user-times" aria-hidden="true"></i>
</button> </button>
</span> </span>
{{else}} {{else}}
<button class="button rounded small reactivate btn-warning"> <button class="button rounded small reactivate button-warning">
<i class="fa fa-user-plus" aria-hidden="true"></i> <i class="fa fa-user-plus" aria-hidden="true"></i>
</button> </button>
{{/if}} {{/if}}

2
web/templates/settings/alert_word_settings_item.hbs
View File

@ -7,7 +7,7 @@
</div> </div>
</td> </td>
<td> <td>
<button type="submit" class="button rounded small delete btn-danger remove-alert-word tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Delete' }}" data-word="{{word}}"> <button type="submit" class="button rounded small delete button-danger remove-alert-word tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Delete' }}" data-word="{{word}}">
<i class="fa fa-trash-o" aria-hidden="true"></i> <i class="fa fa-trash-o" aria-hidden="true"></i>
</button> </button>
</td> </td>

4
web/templates/settings/bot_avatar_row.hbs
View File

@ -44,14 +44,14 @@
<div class="bot-card-api-key-value-and-button no-select"> <div class="bot-card-api-key-value-and-button no-select">
<!-- have the `.text-select` in `.no-select` so that the value doesn't have trailing whitespace. --> <!-- have the `.text-select` in `.no-select` so that the value doesn't have trailing whitespace. -->
<span class="bot-card-value text-select">{{api_key}}</span> <span class="bot-card-value text-select">{{api_key}}</span>
<button type="submit" class="button no-style btn-secondary bot-card-regenerate-bot-api-key tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Generate new API key' }}" data-user-id="{{user_id}}"> <button type="submit" class="button no-style button-secondary bot-card-regenerate-bot-api-key tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Generate new API key' }}" data-user-id="{{user_id}}">
<i class="fa fa-refresh" aria-hidden="true"></i> <i class="fa fa-refresh" aria-hidden="true"></i>
</button> </button>
</div> </div>
<div class="bot-card-api-key-error text-error"></div> <div class="bot-card-api-key-error text-error"></div>
</div> </div>
{{else}} {{else}}
<button class="button round btn-warning reactivate_bot" data-user-id="{{user_id}}">{{t "Reactivate bot" }}</button> <button class="button round button-warning reactivate_bot" data-user-id="{{user_id}}">{{t "Reactivate bot" }}</button>
{{/if}} {{/if}}
</div> </div>
</li> </li>

2
web/templates/settings/edit_bot_form.hbs
View File

@ -51,7 +51,7 @@
{{/if}} {{/if}}
<div class="input-group"> <div class="input-group">
{{#if is_active}} {{#if is_active}}
<button class="button rounded btn-danger deactivate_bot_button"> <button class="button rounded button-danger deactivate_bot_button">
{{t 'Deactivate bot' }} {{t 'Deactivate bot' }}
</button> </button>
{{else}} {{else}}

2
web/templates/settings/organization_profile_admin.hbs
View File

@ -89,7 +89,7 @@
<div class="deactivate-realm-section"> <div class="deactivate-realm-section">
<div class="input-group"> <div class="input-group">
<div id="deactivate_realm_button_container" class="inline-block {{#unless is_owner}}disabled_setting_tooltip{{/unless}}"> <div id="deactivate_realm_button_container" class="inline-block {{#unless is_owner}}disabled_setting_tooltip{{/unless}}">
<button class="button rounded btn-danger deactivate_realm_button"> <button class="button rounded button-danger deactivate_realm_button">
{{t 'Deactivate organization' }} {{t 'Deactivate organization' }}
</button> </button>
</div> </div>

2
web/templates/settings/uploaded_files_list.hbs
View File

@ -26,7 +26,7 @@
</span> </span>
<span class="edit-attachment-buttons"> <span class="edit-attachment-buttons">
<button type="submit" <button type="submit"
class="button rounded small delete btn-danger remove-attachment tippy-zulip-delayed-tooltip" class="button rounded small delete button-danger remove-attachment tippy-zulip-delayed-tooltip"
data-tippy-content="{{t 'Delete' }}" data-attachment="{{id}}"> data-tippy-content="{{t 'Delete' }}" data-attachment="{{id}}">
<i class="fa fa-trash-o" aria-hidden="true"></i> <i class="fa fa-trash-o" aria-hidden="true"></i>
</button> </button>

2
web/templates/stream_settings/stream_member_list_entry.hbs
View File

@ -11,7 +11,7 @@
<td class="unsubscribe"> <td class="unsubscribe">
<div class="subscriber_list_remove"> <div class="subscriber_list_remove">
<form class="remove-subscriber-form"> <form class="remove-subscriber-form">
<button type="submit" name="unsubscribe" class="remove-subscriber-button button small rounded btn-danger"> <button type="submit" name="unsubscribe" class="remove-subscriber-button button small rounded button-danger">
{{#if for_user_group_members}} {{#if for_user_group_members}}
{{t 'Remove'}} {{t 'Remove'}}
{{else}} {{else}}

4
web/templates/stream_settings/stream_settings.hbs
View File

@ -21,7 +21,7 @@
</div> </div>
<a href="{{preview_url}}" class="button small rounded tippy-zulip-delayed-tooltip" id="preview-stream-button" role="button" data-tooltip-template-id="view-stream-tooltip-template" data-tippy-placement="bottom" {{#unless should_display_preview_button }}style="display: none"{{/unless}}><i class="fa fa-eye"></i></a> <a href="{{preview_url}}" class="button small rounded tippy-zulip-delayed-tooltip" id="preview-stream-button" role="button" data-tooltip-template-id="view-stream-tooltip-template" data-tippy-placement="bottom" {{#unless should_display_preview_button }}style="display: none"{{/unless}}><i class="fa fa-eye"></i></a>
{{#if is_realm_admin}} {{#if is_realm_admin}}
<button class="button small rounded btn-danger deactivate tippy-zulip-delayed-tooltip" type="button" name="delete_button" data-tippy-content="{{t 'Archive channel'}}"> <button class="button small rounded button-danger deactivate tippy-zulip-delayed-tooltip" type="button" name="delete_button" data-tippy-content="{{t 'Archive channel'}}">
<span class="icon-container"> <span class="icon-container">
<i class="zulip-icon zulip-icon-archive" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-archive" aria-hidden="true"></i>
</span> </span>
@ -47,7 +47,7 @@
</div> </div>
<div class="stream_change_property_info alert-notification"></div> <div class="stream_change_property_info alert-notification"></div>
<div class="button-group" {{#unless can_change_name_description}}style="display:none"{{/unless}}> <div class="button-group" {{#unless can_change_name_description}}style="display:none"{{/unless}}>
<button id="open_stream_info_modal" class="button rounded small btn-warning tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edit channel name and description' }}"> <button id="open_stream_info_modal" class="button rounded small button-warning tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edit channel name and description' }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fa fa-pencil" aria-hidden="true"></i>
</button> </button>
</div> </div>

4
web/templates/user_group_settings/user_group_settings.hbs
View File

@ -10,7 +10,7 @@
{{/if}} {{/if}}
</button> </button>
</div> </div>
<button class="button small rounded btn-danger deactivate tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate group'}}" type="button" name="delete_button"> <i class="fa fa-trash-o" aria-hidden="true"></i></button> <button class="button small rounded button-danger deactivate tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate group'}}" type="button" name="delete_button"> <i class="fa fa-trash-o" aria-hidden="true"></i></button>
</div> </div>
</div> </div>
<div class="user_group_settings_wrapper" data-group-id="{{group.id}}"> <div class="user_group_settings_wrapper" data-group-id="{{group.id}}">
@ -23,7 +23,7 @@
</div> </div>
<div class="group_change_property_info alert-notification"></div> <div class="group_change_property_info alert-notification"></div>
<div class="button-group"> <div class="button-group">
<button id="open_group_info_modal" class="button rounded small btn-warning tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Change group info' }}"> <button id="open_group_info_modal" class="button rounded small button-warning tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Change group info' }}">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fa fa-pencil" aria-hidden="true"></i>
</button> </button>
</div> </div>

2
web/templates/user_group_settings/user_group_subgroup_entry.hbs
View File

@ -6,7 +6,7 @@
<td class="remove"> <td class="remove">
<div class="subgroup_list_remove"> <div class="subgroup_list_remove">
<form class="remove-subgroup-form"> <form class="remove-subgroup-form">
<button type="submit" name="remove" class="remove-subgroup-button button small rounded btn-danger"> <button type="submit" name="remove" class="remove-subgroup-button button small rounded button-danger">
{{t 'Remove'}} {{t 'Remove'}}
</button> </button>
</form> </form>

2
web/templates/user_stream_list_item.hbs
View File

@ -8,7 +8,7 @@
{{#if show_unsubscribe_button}} {{#if show_unsubscribe_button}}
<td class="remove_subscription"> <td class="remove_subscription">
<div class="subscription_list_remove"> <div class="subscription_list_remove">
<button type="button" name="unsubscribe" class="remove-subscription-button button small rounded btn-danger {{#if (or show_private_stream_unsub_tooltip show_last_user_in_private_stream_unsub_tooltip)}}tippy-zulip-tooltip{{/if}}" data-tippy-content='{{#if show_private_stream_unsub_tooltip}}{{t "Use channel settings to unsubscribe from private channels."}}{{else}}{{t "Use channel settings to unsubscribe the last user from a private channel."}}{{/if}}'> <button type="button" name="unsubscribe" class="remove-subscription-button button small rounded button-danger {{#if (or show_private_stream_unsub_tooltip show_last_user_in_private_stream_unsub_tooltip)}}tippy-zulip-tooltip{{/if}}" data-tippy-content='{{#if show_private_stream_unsub_tooltip}}{{t "Use channel settings to unsubscribe from private channels."}}{{else}}{{t "Use channel settings to unsubscribe the last user from a private channel."}}{{/if}}'>
{{t 'Unsubscribe' }} {{t 'Unsubscribe' }}
</button> </button>
</div> </div>