Skip to content

Commit c83f877

Browse files
authored
Fix login page layout (#120)
1 parent 3a19f29 commit c83f877

File tree

6 files changed

+33
-47
lines changed

6 files changed

+33
-47
lines changed

templates/react/application/src/layouts/single-card/single-card.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ScrollView from 'devextreme-react/scroll-view';
33
import './single-card.scss';
44

55
export default ({ children }) => (
6-
<ScrollView height={'auto'} className={'dx-card single-card'}>
7-
<div className={'content'}>{children}</div>
6+
<ScrollView height={'100%'} width={'100%'} className={'with-footer single-card'}>
7+
<div className={'dx-card content'}>{children}</div>
88
</ScrollView>
99
);
Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
.single-card {
2-
width: 100%;
3-
height: 100%;
4-
display: flex;
5-
}
6-
7-
.single-card.dx-card {
8-
width: 330px;
9-
margin: auto auto;
102

11-
.screen-x-small & {
12-
width: 100%;
13-
height: 100%;
14-
border-radius: 0;
15-
box-shadow: none;
16-
margin: 0;
17-
border: 0;
18-
}
19-
20-
.content {
3+
.dx-card {
4+
width: 330px;
5+
margin: auto auto;
216
padding: 40px;
22-
}
7+
flex-grow: 0;
8+
9+
.screen-x-small & {
10+
width: 100%;
11+
height: 100%;
12+
border-radius: 0;
13+
box-shadow: none;
14+
margin: 0;
15+
border: 0;
16+
flex-grow: 1;
17+
}
18+
}
2319
}
Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<dx-scroll-view height="auto" class="dx-card single-card">
3-
<slot />
2+
<dx-scroll-view height="100%" width="100%" class="with-footer single-card">
3+
<div class="dx-card"><slot /></div>
44
</dx-scroll-view>
55
</template>
66

@@ -16,26 +16,22 @@ export default {
1616

1717
<style lang="scss">
1818
.single-card {
19-
width: 100%;
20-
height: 100%;
21-
display: flex;
22-
}
23-
24-
.single-card.dx-card {
25-
width: 330px;
26-
margin: auto auto;
27-
28-
.screen-x-small & {
29-
width: 100%;
30-
height: 100%;
31-
border-radius: 0;
32-
box-shadow: none;
33-
margin: 0;
34-
border: 0;
35-
}
3619
37-
.content {
20+
.dx-card {
21+
width: 330px;
22+
margin: auto auto;
3823
padding: 40px;
24+
25+
.screen-x-small & {
26+
width: 100%;
27+
height: 100%;
28+
border-radius: 0;
29+
box-shadow: none;
30+
margin: 0;
31+
border: 0;
32+
flex-grow: 1;
33+
}
3934
}
4035
}
36+
4137
</style>
52 Bytes
Loading
39 Bytes
Loading

testing/app-template.test.shared.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ module.exports = (env) => {
137137
});
138138

139139
it('Login page', async() => {
140-
// TODO: Fix Angular
141-
if(env.engine === 'angular') {
142-
expect(true).toBe(true);
143-
return;
144-
}
145-
146140
// NOTE: Test only once
147141
if(!isDefaultLayout) {
148142
return;

0 commit comments

Comments
 (0)