Skip to content

Commit 2a662bf

Browse files
Update auth forms (#907)
* update Vue forms * update React forms * update Angular forms * set legacy-peer-deps=true for github actions * remove unused bootstrap tests * update screenshots * update screenshots * fix test name * update screenshots * fix styles for single-card (Angular, Vue) * fix styles for single-card (React) and "create account" button set stylingMode=outlined * update screenshots * update screenshots + fix styles (vue, react) * fix design issues * update screenshots * update screenshots * fix styles for React * update screenshots * fix styles
1 parent 60e7a1c commit 2a662bf

File tree

101 files changed

+134
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+134
-148
lines changed

packages/devextreme-cli/src/templates/react/application/src/components/create-account-form/CreateAccountForm.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
.create-account-form {
44
.policy-info {
5-
margin: 10px 0;
65
color: var(--base-text-color-alpha-7);
7-
font-size: 14px;
6+
font-size: 12px;
87
font-style: normal;
98

109
a {
@@ -14,7 +13,9 @@
1413

1514
.login-link {
1615
color: var(--base-accent);
17-
font-size: 16px;
16+
font-size: 12px;
1817
text-align: center;
18+
padding: 6px 0 32px 0;
19+
border-bottom: 1px solid var(--border-color);
1920
}
2021
}

packages/devextreme-cli/src/templates/react/application/src/components/create-account-form/CreateAccountForm.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,10 @@ export default function CreateAccountForm() {
9292
</span>
9393
</ButtonOptions>
9494
</ButtonItem>
95-
<Item>
96-
<div className={'login-link'}>
97-
Have an account? <Link to={'/login'}>Sign In</Link>
98-
</div>
99-
</Item>
10095
</Form>
96+
<div className={'login-link'}>
97+
Have an account? <Link to={'/login'}>Sign In</Link>
98+
</div>
10199
</form>
102100
);
103101
}

packages/devextreme-cli/src/templates/react/application/src/components/login-form/LoginForm.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
.login-form {
44
.link {
55
text-align: center;
6-
font-size: 16px;
6+
font-size: 12px;
77
font-style: normal;
8-
9-
a {
10-
text-decoration: none;
11-
}
8+
margin: 6px 0 50px;
129
}
1310

1411
.form-text {
15-
margin: 10px 0;
1612
color: var(--base-text-color-alpha-7);
1713
}
1814
}

packages/devextreme-cli/src/templates/react/application/src/components/login-form/LoginForm.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Form, {
99
EmailRule
1010
} from 'devextreme-react/form';
1111
import LoadIndicator from 'devextreme-react/load-indicator';
12+
import Button from 'devextreme-react/button';
1213
import notify from 'devextreme/ui/notify';
1314
import { useAuth } from '../../contexts/auth';
1415

@@ -78,19 +79,16 @@ export default function LoginForm() {
7879
</span>
7980
</ButtonOptions>
8081
</ButtonItem>
81-
<Item>
82-
<div className={'link'}>
83-
<Link to={'/reset-password'}>Forgot password?</Link>
84-
</div>
85-
</Item>
86-
<ButtonItem>
87-
<ButtonOptions
88-
text={'Create an account'}
89-
width={'100%'}
90-
onClick={onCreateAccountClick}
91-
/>
92-
</ButtonItem>
9382
</Form>
83+
<div className={'link'}>
84+
<Link to={'/reset-password'}>Forgot password?</Link>
85+
</div>
86+
<Button
87+
text={'Create an account'}
88+
stylingMode={ 'outlined' }
89+
width={'100%'}
90+
onClick={onCreateAccountClick}
91+
/>
9492
</form>
9593
);
9694
}

packages/devextreme-cli/src/templates/react/application/src/components/reset-password-form/ResetPasswordForm.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
.reset-password-form {
44
.submit-button {
5-
margin-top: 10px;
5+
margin-top: 18px;
66
}
77

88
.login-link {
99
color: var(--base-accent);
10-
font-size: 16px;
10+
font-size: 12px;
1111
text-align: center;
12+
margin-top: 6px;
1213
}
1314
}

packages/devextreme-cli/src/templates/react/application/src/components/reset-password-form/ResetPasswordForm.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,10 @@ export default function ResetPasswordForm() {
6464
</span>
6565
</ButtonOptions>
6666
</ButtonItem>
67-
<Item>
68-
<div className={'login-link'}>
69-
Return to <Link to={'/login'}>Sign In</Link>
70-
</div>
71-
</Item>
7267
</Form>
68+
<div className={'login-link'}>
69+
Return to <Link to={'/login'}>Sign In</Link>
70+
</div>
7371
</form>
7472
);
7573
}

packages/devextreme-cli/src/templates/react/application/src/dx-styles.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ body {
2525
display: flex;
2626
height: 100%;
2727
width: 100%;
28+
min-width: 320px;
2829
}
2930

3031
.content {
@@ -37,10 +38,10 @@ body {
3738
margin: 0;
3839
line-height: 40px;
3940
}
41+
}
4042

41-
.screen-x-small & {
42-
padding: 20px;
43-
}
43+
.screen-x-small :not(.dx-card).content {
44+
padding: 20px;
4445
}
4546

4647
.container {

packages/devextreme-cli/src/templates/react/application/src/layouts/single-card/single-card.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
height: 100%;
66

77
.dx-card {
8-
width: 330px;
8+
width: 360px;
99
margin: auto auto;
10-
padding: 40px;
10+
padding: 24px;
1111
flex-grow: 0;
12+
border-radius: 8px;
1213

1314
.screen-x-small & {
1415
width: 100%;
@@ -21,18 +22,22 @@
2122
}
2223

2324
.header {
24-
margin-bottom: 30px;
25+
margin: 24px 0;
2526

2627
.title {
2728
color: var(--base-text-color);
28-
line-height: 28px;
2929
font-weight: 500;
3030
font-size: 24px;
31+
text-align: center;
32+
line-height: 24px;
3133
}
3234

3335
.description {
3436
color: var(--base-text-color-alpha-7);
35-
line-height: 18px;
37+
line-height: 16px;
38+
font-size: 12px;
39+
margin-top: 32px;
40+
text-align: center;
3641
}
3742
}
3843
}

packages/devextreme-cli/src/templates/vue-v3/application/src/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,6 @@ body {
9393
display: flex;
9494
height: 100%;
9595
width: 100%;
96+
min-width: 320px;
9697
}
9798
</style>

packages/devextreme-cli/src/templates/vue-v3/application/src/dx-styles.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ $side-panel-min-width: 60px;
1515
margin: 0;
1616
line-height: 40px;
1717
}
18+
}
1819

19-
.screen-x-small & {
20-
padding: 20px;
21-
}
20+
.screen-x-small :not(.dx-card).content {
21+
padding: 20px;
2222
}
2323

2424
.container {

0 commit comments

Comments
 (0)