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

modal: Rename modal__btn -> modal__button. 

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-13 17:43:51 +05:30 committed by Tim Abbott
parent ef929efa1f
commit cf672ad939
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
templates/corporate/billing/billing.html
View File

@ -436,8 +436,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Downgrade') }}</span> <span>{{ _('Downgrade') }}</span>
</button> </button>
</footer> </footer>
@ -469,8 +469,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Confirm') }}</span> <span>{{ _('Confirm') }}</span>
</button> </button>
</footer> </footer>
@ -498,8 +498,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Confirm') }}</span> <span>{{ _('Confirm') }}</span>
</button> </button>
</footer> </footer>
@ -524,8 +524,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Downgrade') }}</span> <span>{{ _('Downgrade') }}</span>
</button> </button>
</footer> </footer>
@ -552,8 +552,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Downgrade') }}</span> <span>{{ _('Downgrade') }}</span>
</button> </button>
</footer> </footer>
@ -580,8 +580,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Cancel upgrade') }}</span> <span>{{ _('Cancel upgrade') }}</span>
</button> </button>
</footer> </footer>
@ -617,8 +617,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Confirm') }}</span> <span>{{ _('Confirm') }}</span>
</button> </button>
</footer> </footer>

4
templates/corporate/billing/upgrade.html
View File

@ -354,8 +354,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span> <span>
{% if page_params.free_trial_days %} {% if page_params.free_trial_days %}
{{ _('Send invoice and start free trial') }} {{ _('Send invoice and start free trial') }}

4
templates/zerver/change_email_address_visibility_modal.html
View File

@ -23,8 +23,8 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Confirm') }}</span> <span>{{ _('Confirm') }}</span>
</button> </button>
</footer> </footer>

4
templates/zerver/development/email_log.html
View File

@ -61,8 +61,8 @@
</div> </div>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Close') }}</button> <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Close') }}</button>
<button class="modal__btn dialog_submit_button"> <button class="modal__button dialog_submit_button">
<span>{{ _('Update') }}</span> <span>{{ _('Update') }}</span>
</button> </button>
</footer> </footer>

4
web/src/dialog_widget.ts
View File

@ -90,7 +90,7 @@ type RequestOpts = {
export function hide_dialog_spinner(): void { export function hide_dialog_spinner(): void {
const dialog_widget_selector = current_dialog_widget_selector(); const dialog_widget_selector = current_dialog_widget_selector();
const $spinner = $(`${dialog_widget_selector} .modal__spinner`); const $spinner = $(`${dialog_widget_selector} .modal__spinner`);
$(`${dialog_widget_selector} .modal__btn`).prop("disabled", false); $(`${dialog_widget_selector} .modal__button`).prop("disabled", false);
loading.hide_spinner($(".dialog_submit_button"), $spinner); loading.hide_spinner($(".dialog_submit_button"), $spinner);
} }
@ -98,7 +98,7 @@ export function hide_dialog_spinner(): void {
export function show_dialog_spinner(): void { export function show_dialog_spinner(): void {
const dialog_widget_selector = current_dialog_widget_selector(); const dialog_widget_selector = current_dialog_widget_selector();
// Disable both the buttons. // Disable both the buttons.
$(`${dialog_widget_selector} .modal__btn`).prop("disabled", true); $(`${dialog_widget_selector} .modal__button`).prop("disabled", true);
const $spinner = $(`${dialog_widget_selector} .modal__spinner`); const $spinner = $(`${dialog_widget_selector} .modal__spinner`);

6
web/styles/modal.css
View File

@ -111,7 +111,7 @@
} }
} }
.modal__btn { .modal__button {
/* We need the backup value for billing related html files where /* We need the backup value for billing related html files where
this variable is not defined. */ this variable is not defined. */
font-size: var(--base-font-size-px, 14px); font-size: var(--base-font-size-px, 14px);
@ -139,8 +139,8 @@
} }
} }
.modal__btn:focus, .modal__button:focus,
.modal__btn:hover { .modal__button:hover {
transform: scale(1.05); transform: scale(1.05);
/* The extremely subtle 1.05 scale can cause /* The extremely subtle 1.05 scale can cause
a gap to appear between the outline and a gap to appear between the outline and

4
web/templates/dialog_widget.hbs
View File

@ -16,10 +16,10 @@
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
{{#unless single_footer_button}} {{#unless single_footer_button}}
<button class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button> <button class="modal__button dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button>
{{/unless}} {{/unless}}
<div class="dialog_submit_button_container"> <div class="dialog_submit_button_container">
<button class="modal__btn dialog_submit_button"{{#if single_footer_button}} aria-label="{{t 'Close this dialog window' }}" data-micromodal-close{{/if}}> <button class="modal__button dialog_submit_button"{{#if single_footer_button}} aria-label="{{t 'Close this dialog window' }}" data-micromodal-close{{/if}}>
<span class="submit-button-text">{{{ html_submit_button }}}</span> <span class="submit-button-text">{{{ html_submit_button }}}</span>
<div class="modal__spinner"></div> <div class="modal__spinner"></div>
</button> </button>

4
web/templates/login_to_access.hbs
View File

@ -22,10 +22,10 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<a class="modal__btn dialog_submit_button" href="{{signup_link}}"> <a class="modal__button dialog_submit_button" href="{{signup_link}}">
<span>{{t "Sign up" }}</span> <span>{{t "Sign up" }}</span>
</a> </a>
<a class="modal__btn dialog_submit_button" href="{{login_link}}"> <a class="modal__button dialog_submit_button" href="{{login_link}}">
<span>{{t "Log in" }}</span> <span>{{t "Log in" }}</span>
</a> </a>
</footer> </footer>

2
web/templates/profile_access_error_modal.hbs
View File

@ -13,7 +13,7 @@
</p> </p>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button type="button" class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Close" }}</button> <button type="button" class="modal__button dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Close" }}</button>
</footer> </footer>
</div> </div>
</div> </div>

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

@ -33,12 +33,12 @@
</div> </div>
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
<button type="submit" name="view_api_key" id="get_api_key_button" class="modal__btn dialog_submit_button"> <button type="submit" name="view_api_key" id="get_api_key_button" class="modal__button dialog_submit_button">
{{t 'Get API key' }} {{t 'Get API key' }}
</button> </button>
<div id="api_key_buttons"> <div id="api_key_buttons">
<button class="modal__btn dialog_submit_button" id="regenerate_api_key" aria-label="{{t 'Generate new API key' }}">{{t "Generate new API key" }}</button> <button class="modal__button dialog_submit_button" id="regenerate_api_key" aria-label="{{t 'Generate new API key' }}">{{t "Generate new API key" }}</button>
<a class="modal__btn dialog_submit_button" id="download_zuliprc" download="zuliprc" tabindex="0">{{t "Download zuliprc" }}</a> <a class="modal__button dialog_submit_button" id="download_zuliprc" download="zuliprc" tabindex="0">{{t "Download zuliprc" }}</a>
</div> </div>
</footer> </footer>
</div> </div>

4
web/templates/user_profile_modal.hbs
View File

@ -138,8 +138,8 @@
<div class="manage-profile-tab-footer"> <div class="manage-profile-tab-footer">
<footer class="modal__footer"> <footer class="modal__footer">
<div class="save-success"></div> <div class="save-success"></div>
<button type="button" class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Cancel" }}</button> <button type="button" class="modal__button dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Cancel" }}</button>
<button type="button" class="modal__btn dialog_submit_button"> <button type="button" class="modal__button dialog_submit_button">
<span class="submit-button-text">{{t "Save changes"}}</span> <span class="submit-button-text">{{t "Save changes"}}</span>
<div class="modal__spinner"></div> <div class="modal__spinner"></div>
</button> </button>