diff --git a/apps/web/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png b/apps/web/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png index 73f261ec67..2ef33d986d 100644 Binary files a/apps/web/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png and b/apps/web/playwright/snapshots/devtools/upgraderoom.spec.ts/upgrade-room-linux.png differ diff --git a/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-locally-linux.png b/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-locally-linux.png index c6a06a5035..cfb00e09d2 100644 Binary files a/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-locally-linux.png and b/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-locally-linux.png differ diff --git a/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-via-url-linux.png b/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-via-url-linux.png index 01a70ee5c4..8fc89b95e7 100644 Binary files a/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-via-url-linux.png and b/apps/web/playwright/snapshots/feedback/rageshakes.spec.ts/rageshake-via-url-linux.png differ diff --git a/apps/web/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png b/apps/web/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png index 24d7fdd823..26695de1fc 100644 Binary files a/apps/web/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png and b/apps/web/playwright/snapshots/invite/decline-and-block-invite-dialog.spec.ts/decline-and-block-invite-empty-linux.png differ diff --git a/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png b/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png index 26f582684f..fcee8f2434 100644 Binary files a/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png and b/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png differ diff --git a/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png b/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png index 10fe7a381f..173c2ca55e 100644 Binary files a/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png and b/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-linux.png differ diff --git a/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png b/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png index adae285fa5..d0b53f2528 100644 Binary files a/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png and b/apps/web/playwright/snapshots/room/create-room.spec.ts/create-room-no-public-linux.png differ diff --git a/apps/web/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png b/apps/web/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png index a8fe2e9e64..1a7943077d 100644 Binary files a/apps/web/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png and b/apps/web/playwright/snapshots/room/create-room.spec.ts/create-video-room-linux.png differ diff --git a/apps/web/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png b/apps/web/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png index dc74cd8746..35bd9b5e3d 100644 Binary files a/apps/web/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png and b/apps/web/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png differ diff --git a/apps/web/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png b/apps/web/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png index 69a02378b5..193a7a8b46 100644 Binary files a/apps/web/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png and b/apps/web/playwright/snapshots/widgets/permissions-dialog.spec.ts/widget-capabilites-prompt-linux.png differ diff --git a/apps/web/res/css/_common.pcss b/apps/web/res/css/_common.pcss index 06d27758a9..1b0e3e2f30 100644 --- a/apps/web/res/css/_common.pcss +++ b/apps/web/res/css/_common.pcss @@ -662,6 +662,7 @@ legend { button:not( .mx_Dialog_nonDialogButton, .mx_AccessibleButton, + .cancel, .mx_UserProfileSettings button, .mx_ThemeChoicePanel_CustomTheme button, .mx_UnpinAllDialog button, @@ -723,6 +724,13 @@ legend { opacity: 0.7; } +.mx_Dialog_buttons button.cancel { + color: var(--cpd-color-text-primary); + background-color: var(--cpd-color-bg-action-secondary-rest); + border-color: var(--cpd-color-border-interactive-secondary); + min-width: 156px; +} + /* Spinner Dialog overide */ .mx_Dialog_wrapper.mx_Dialog_spinner { /* This is not a real dialog, so we shouldn't show a glass border */ diff --git a/apps/web/src/components/views/elements/DialogButtons.tsx b/apps/web/src/components/views/elements/DialogButtons.tsx index 9712639638..b81c06e643 100644 --- a/apps/web/src/components/views/elements/DialogButtons.tsx +++ b/apps/web/src/components/views/elements/DialogButtons.tsx @@ -29,8 +29,10 @@ interface IProps { // should there be a cancel button? default: true hasCancel?: boolean; - // The class of the cancel button, only used if a cancel button is - // enabled + /** + * The class of the cancel button, only used if a cancel button is enabled + * @default "cancel" + */ cancelButtonClass?: string; // onClick handler for the cancel button. @@ -58,6 +60,7 @@ export default class DialogButtons extends React.Component { public static defaultProps: Partial = { hasCancel: true, disabled: false, + cancelButtonClass: "cancel", }; private onCancelClick = (event: React.MouseEvent): void => { diff --git a/apps/web/test/unit-tests/__snapshots__/Terms-test.ts.snap b/apps/web/test/unit-tests/__snapshots__/Terms-test.ts.snap index 7c1bbaa5c0..4b30a38840 100644 --- a/apps/web/test/unit-tests/__snapshots__/Terms-test.ts.snap +++ b/apps/web/test/unit-tests/__snapshots__/Terms-test.ts.snap @@ -107,6 +107,7 @@ exports[`dialogTermsInteractionCallback should render a dialog with the expected class="mx_Dialog_buttons_row" >