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

dialog_widget: Rename "dialog_cancel_button" to "dialog_exit_button". 

This commit renames "dialog_cancel_button" class in the exit button
of modals to "dialog_exit_button", which seems a much better name
for a button that is used to close a modal.
This commit is contained in:
Sahil Batra 2023-07-25 21:28:43 +05:30 committed by Tim Abbott
parent 8db9093d0b
commit befcb46ba3
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/change_email_address_visibility_modal.html
View File

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

2
web/e2e-tests/realm-linkifier.test.ts
View File

@ -104,7 +104,7 @@ async function test_edit_invalid_linkifier(page: Page): Promise<void> {
); );
assert.strictEqual(edit_linkifier_template_status, "Failed: Invalid URL template."); assert.strictEqual(edit_linkifier_template_status, "Failed: Invalid URL template.");
await page.click(".dialog_cancel_button"); await page.click(".dialog_exit_button");
await page.waitForSelector("#dialog_widget_modal", {hidden: true}); await page.waitForSelector("#dialog_widget_modal", {hidden: true});
await page.waitForSelector(".linkifier_row", {visible: true}); await page.waitForSelector(".linkifier_row", {visible: true});

4
web/e2e-tests/settings.test.ts
View File

@ -248,7 +248,7 @@ async function test_invalid_edit_bot_form(page: Page): Promise<void> {
"Failed: Name is already in use!", "Failed: Name is already in use!",
); );
const cancel_button_selector = "#edit_bot_modal .dialog_cancel_button"; const cancel_button_selector = "#edit_bot_modal .dialog_exit_button";
await page.waitForFunction( await page.waitForFunction(
(cancel_button_selector: string) => (cancel_button_selector: string) =>
!document.querySelector(cancel_button_selector)?.hasAttribute("disabled"), !document.querySelector(cancel_button_selector)?.hasAttribute("disabled"),
@ -320,7 +320,7 @@ async function test_duplicate_alert_words_cannot_be_added(
const status_text = await common.get_text_from_selector(page, alert_word_status_selector); const status_text = await common.get_text_from_selector(page, alert_word_status_selector);
assert.strictEqual(status_text, "Alert word already exists!"); assert.strictEqual(status_text, "Alert word already exists!");
await page.click("#add-alert-word .dialog_cancel_button"); await page.click("#add-alert-word .dialog_exit_button");
await common.wait_for_micromodal_to_close(page); await common.wait_for_micromodal_to_close(page);
} }

4
web/src/invite.js
View File

@ -151,7 +151,7 @@ function submit_invitation_form() {
complete() { complete() {
$("#invite-user-modal .dialog_submit_button").text($t({defaultMessage: "Invite"})); $("#invite-user-modal .dialog_submit_button").text($t({defaultMessage: "Invite"}));
$("#invite-user-modal .dialog_submit_button").prop("disabled", false); $("#invite-user-modal .dialog_submit_button").prop("disabled", false);
$("#invite-user-modal .dialog_cancel_button").prop("disabled", false); $("#invite-user-modal .dialog_exit_button").prop("disabled", false);
$("#invitee_emails").trigger("focus"); $("#invitee_emails").trigger("focus");
scroll_util.get_scroll_element($("#invite-user-modal"))[0].scrollTop = 0; scroll_util.get_scroll_element($("#invite-user-modal"))[0].scrollTop = 0;
}, },
@ -178,7 +178,7 @@ function generate_multiuse_invite() {
$t({defaultMessage: "Generate invite link"}), $t({defaultMessage: "Generate invite link"}),
); );
$("#invite-user-modal .dialog_submit_button").prop("disabled", false); $("#invite-user-modal .dialog_submit_button").prop("disabled", false);
$("#invite-user-modal .dialog_cancel_button").prop("disabled", false); $("#invite-user-modal .dialog_exit_button").prop("disabled", false);
scroll_util.get_scroll_element($("#invite-user-modal"))[0].scrollTop = 0; scroll_util.get_scroll_element($("#invite-user-modal"))[0].scrollTop = 0;
}, },
}); });

2
web/styles/dark_theme.css
View File

@ -50,7 +50,7 @@
} }
/************************* MODAL DARK THEME *******************/ /************************* MODAL DARK THEME *******************/
.dialog_cancel_button { .dialog_exit_button {
background-color: hsl(211deg 29% 14%); background-color: hsl(211deg 29% 14%);
color: hsl(0deg 0% 100%); color: hsl(0deg 0% 100%);
border: 1px solid hsl(0deg 0% 0% / 60%); border: 1px solid hsl(0deg 0% 0% / 60%);

2
web/styles/modal.css
View File

@ -124,7 +124,7 @@
transform: scale(1.05); transform: scale(1.05);
} }
.dialog_cancel_button { .dialog_exit_button {
background: hsl(0deg 0% 100%); background: hsl(0deg 0% 100%);
border: 1px solid hsl(300deg 2% 11% / 30%); border: 1px solid hsl(300deg 2% 11% / 30%);

2
web/templates/dialog_widget.hbs
View File

@ -16,7 +16,7 @@
</main> </main>
<footer class="modal__footer"> <footer class="modal__footer">
{{#unless single_footer_button}} {{#unless single_footer_button}}
<button class="modal__btn dialog_cancel_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button> <button class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button>
{{/unless}} {{/unless}}
<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__btn dialog_submit_button"{{#if single_footer_button}} aria-label="{{t 'Close this dialog window' }}" data-micromodal-close{{/if}}>
<span>{{{ html_submit_button }}}</span> <span>{{{ html_submit_button }}}</span>