Skip to content

Commit 8fea377

Browse files
update React forms
1 parent 2e854c7 commit 8fea377

File tree

7 files changed

+27
-33
lines changed

7 files changed

+27
-33
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: 9 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,15 @@ 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+
width={'100%'}
89+
onClick={onCreateAccountClick}
90+
/>
9491
</form>
9592
);
9693
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88
.login-link {

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/layouts/single-card/single-card.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@
3232

3333
.description {
3434
color: var(--base-text-color-alpha-7);
35-
line-height: 18px;
35+
line-height: 16px;
36+
font-size: 12px;
37+
margin-top: 32px;
38+
text-align: center;
3639
}
40+
3741
}
3842
}
3943
}

0 commit comments

Comments
 (0)