Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(editor): UX improvements to mfa setup modal #9059

Merged
merged 5 commits into from
Apr 9, 2024
Merged

fix(editor): UX improvements to mfa setup modal #9059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
438d6f1
fix(editor): Make MfaSetupModal responsive
tomi Apr 4, 2024
1ab317a
fix(editor): Fix MFA setup modal in dark mode
tomi Apr 4, 2024
564480b
fix: Fix linting issue
tomi Apr 4, 2024
fc7837b
Improved dark mode color for the "lose access danger text".
gandreini Apr 4, 2024
e193261
fix: Restore actual recovery code
tomi Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/design-system/src/css/_tokens.dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@
// Node error
--color-node-error-output-text-color: var(--prim-color-alt-c-tint-150);

// MFA Recovery codes
--color-mfa-recovery-code-background: var(--color-background-xlight);
--color-mfa-recovery-code-color: var(--color-text-dark);
--color-mfa-lose-access-text-color: var(--prim-color-alt-c-tint-150);

// Various
--color-info-tint-1: var(--prim-gray-420);
--color-info-tint-2: var(--prim-gray-740);
Expand Down
5 changes: 5 additions & 0 deletions packages/design-system/src/css/_tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@
// Node error
--color-node-error-output-text-color: var(--color-danger);

// MFA Recovery codes
--color-mfa-recovery-code-background: var(--color-background-base);
--color-mfa-recovery-code-color: var(--prim-gray-490);
--color-mfa-lose-access-text-color: var(--color-danger);

// Various
--color-avatar-accent-1: var(--prim-gray-120);
--color-avatar-accent-2: var(--prim-color-alt-e-shade-100);
Expand Down
21 changes: 12 additions & 9 deletions packages/editor-ui/src/components/MfaSetupModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<template>
<Modal
width="460px"
height="80%"
max-height="640px"
:title="
!showRecoveryCodes
? $locale.baseText('mfa.setup.step1.title')
Expand Down Expand Up @@ -274,6 +276,12 @@ export default defineComponent({
</script>

<style module lang="scss">
.container {
display: flex;
flex-direction: column;
height: 100%;
}

.container > * {
overflow: visible;
margin-bottom: var(--spacing-s);
Expand Down Expand Up @@ -303,10 +311,9 @@ export default defineComponent({
text-align: center;
}
.recoveryCodesContainer {
height: 140px;
display: flex;
flex-direction: column;
background-color: var(--color-background-base);
background-color: var(--color-mfa-recovery-code-background);
text-align: center;
flex-wrap: nowrap;
justify-content: space-between;
Expand All @@ -316,14 +323,14 @@ export default defineComponent({
padding-bottom: var(--spacing-xs);
gap: var(--spacing-xs);
margin-bottom: var(--spacing-2xs);
overflow-y: scroll;
overflow-y: auto;
}

.recoveryCodesContainer span {
font-size: var(--font-size-s);
font-weight: var(--font-weight-regular);
line-height: var(--spacing-m);
color: #7d7d87;
color: var(--color-mfa-recovery-code-color);
}

.form:first-child span {
Expand All @@ -341,7 +348,7 @@ export default defineComponent({
}

.loseAccessText {
color: var(--color-danger);
color: var(--color-mfa-lose-access-text-color);
}

.error input {
Expand All @@ -362,8 +369,4 @@ export default defineComponent({
.notice {
margin: 0;
}

.modalContent {
overflow: hidden;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, the original design had the school. Why are we removing it 🤔 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean by "the school"? I had to remove this to make the modal responsive

}
</style>
Loading