Skip to content

Commit bf0a98b

Browse files
ShMcKShMcK
authored
Merge pull request #59 from ShMcK/feature/fix-styles
fix styles
2 parents 4d0b5d9 + 2d84ac6 commit bf0a98b

File tree

6 files changed

+123
-114
lines changed

6 files changed

+123
-114
lines changed

‎web-app/src/containers/Overview/OverviewPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ const styles = {
99
position: 'relative' as 'relative',
1010
display: 'flex' as 'flex',
1111
flexDirection: 'column' as 'column',
12-
justifyContent: 'space-between',
1312
width: '100%',
14-
height: '100%',
1513
},
1614
summary: {
1715
padding: '0rem 1rem 1rem 1rem',
@@ -33,6 +31,8 @@ const styles = {
3331
padding: '0rem 1rem',
3432
},
3533
options: {
34+
position: 'absolute' as 'absolute',
35+
bottom: 0,
3636
display: 'flex' as 'flex',
3737
flexDirection: 'row' as 'row',
3838
alignItems: 'center' as 'center',

‎web-app/src/containers/Tutorial/LevelPage/Level.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ const styles = {
1212
position: 'relative' as 'relative',
1313
display: 'flex' as 'flex',
1414
flexDirection: 'column' as 'column',
15-
justifyContent: 'space-between',
1615
padding: 0,
1716
width: '100%',
18-
height: '100%',
1917
},
2018
header: {
2119
height: '36px',
@@ -41,13 +39,17 @@ const styles = {
4139
},
4240
processes: {
4341
padding: '0 1rem',
42+
position: 'absolute' as 'absolute',
43+
bottom: '36px',
4444
},
4545
footer: {
4646
height: '36px',
4747
backgroundColor: 'black',
4848
fontSize: '16px',
4949
lineHeight: '16px',
5050
padding: '10px 1rem',
51+
position: 'absolute' as 'absolute',
52+
bottom: 0,
5153
color: 'white',
5254
width: '100%',
5355
},

‎web-app/src/styles/index.css

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
@import '~@alifd/next/dist/next.css';
22
@import '~@alifd/theme-4/dist/next.css';
33

4+
html {
5+
height: 100%;
6+
width: 100%;
7+
}
8+
49
body {
5-
margin: 0;
6-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
7-
'Droid Sans', 'Helvetica Neue', sans-serif;
8-
-webkit-font-smoothing: antialiased;
9-
-moz-osx-font-smoothing: grayscale;
10+
height: 100%;
11+
width: 100%;
12+
margin: 0;
13+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
14+
'Droid Sans', 'Helvetica Neue', sans-serif;
15+
-webkit-font-smoothing: antialiased;
16+
-moz-osx-font-smoothing: grayscale;
1017
}
1118

1219
code {
13-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
20+
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
1421
}
1522

1623
p {
17-
margin: 0;
24+
margin: 0;
1825
}

‎web-app/stories/data/basic.ts

+88-88
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
import * as CR from 'typings'
22

33
const basic: CR.Tutorial = {
4-
id: 'tutorialId',
5-
meta: {
6-
version: '0.1.0',
7-
repo: 'https://github.com/ShMcK/coderoad-vscode.git',
8-
createdBy: 'shmck',
9-
createdAt: 'Sat, 11 May 2019 18:25:24 GMT',
10-
updatedBy: 'shmck',
11-
updatedAt: 'Sat, 11 May 2019 18:25:24 GMT',
12-
contributors: ['shmck'],
13-
languages: ['javascript'],
14-
testRunner: 'jest',
15-
},
16-
data: {
17-
summary: {
18-
title: 'Basic Test',
19-
description: 'A basic coding skills example',
20-
levelList: ['level1Id'],
21-
},
22-
levels: {
23-
level1Id: {
24-
stageList: ['stage1Id'],
25-
content: {
26-
title: 'Sum Level',
27-
text: 'A description of this stage',
28-
},
29-
},
30-
},
31-
stages: {
32-
stage1Id: {
33-
stepList: ['step1Id', 'step2Id', 'step3Id'],
34-
content: {
35-
title: 'Sum Stage',
36-
text: 'A description of this stage',
37-
},
38-
},
39-
},
40-
steps: {
41-
step1Id: {
42-
content: {
43-
title: 'Sum',
44-
text: 'Write a function that adds two numbers together',
45-
},
46-
actions: {
47-
setup: {
48-
commits: ['430500f', '8383061'],
49-
commands: ['npm install'],
50-
files: ['src/sum.js'],
51-
},
52-
solution: {
53-
commits: ['abbe136'],
54-
},
55-
},
56-
hints: [],
57-
},
58-
step2Id: {
59-
content: {
60-
title: 'Multiply',
61-
text: 'Write a function that multiplies two numbers together',
62-
},
63-
actions: {
64-
setup: {
65-
commits: ['9cbb518'],
66-
files: ['src/multiply.js'],
67-
},
68-
solution: {
69-
commits: ['5ae011f'],
70-
},
71-
},
72-
hints: [],
73-
},
74-
step3Id: {
75-
content: {
76-
title: 'Divide',
77-
text: 'Write a function that divides',
78-
},
79-
actions: {
80-
setup: {
81-
commits: ['70c774c'],
82-
files: ['src/divide.js'],
83-
},
84-
solution: {
85-
commits: ['3180bed'],
86-
},
87-
},
88-
hints: [],
89-
},
90-
},
91-
},
4+
id: 'tutorialId',
5+
meta: {
6+
version: '0.1.0',
7+
repo: 'https://github.com/ShMcK/coderoad-vscode.git',
8+
createdBy: 'shmck',
9+
createdAt: 'Sat, 11 May 2019 18:25:24 GMT',
10+
updatedBy: 'shmck',
11+
updatedAt: 'Sat, 11 May 2019 18:25:24 GMT',
12+
contributors: ['shmck'],
13+
languages: ['javascript'],
14+
testRunner: 'jest',
15+
},
16+
data: {
17+
summary: {
18+
title: 'Basic Test',
19+
description: 'A basic coding skills example',
20+
levelList: ['level1Id'],
21+
},
22+
levels: {
23+
level1Id: {
24+
stageList: ['stage1Id'],
25+
content: {
26+
title: 'Sum Level',
27+
text: 'A description of this stage',
28+
},
29+
},
30+
},
31+
stages: {
32+
stage1Id: {
33+
stepList: ['step1Id', 'step2Id', 'step3Id'],
34+
content: {
35+
title: 'Sum Stage',
36+
text: 'A description of this stage',
37+
},
38+
},
39+
},
40+
steps: {
41+
step1Id: {
42+
content: {
43+
title: 'Sum',
44+
text: 'Write a function that adds two numbers together',
45+
},
46+
actions: {
47+
setup: {
48+
commits: ['430500f', '8383061'],
49+
commands: ['npm install'],
50+
files: ['src/sum.js'],
51+
},
52+
solution: {
53+
commits: ['abbe136'],
54+
},
55+
},
56+
hints: [],
57+
},
58+
step2Id: {
59+
content: {
60+
title: 'Multiply',
61+
text: 'Write a function that multiplies two numbers together',
62+
},
63+
actions: {
64+
setup: {
65+
commits: ['9cbb518'],
66+
files: ['src/multiply.js'],
67+
},
68+
solution: {
69+
commits: ['5ae011f'],
70+
},
71+
},
72+
hints: [],
73+
},
74+
step3Id: {
75+
content: {
76+
title: 'Divide',
77+
text: 'Write a function that divides',
78+
},
79+
actions: {
80+
setup: {
81+
commits: ['70c774c'],
82+
files: ['src/divide.js'],
83+
},
84+
solution: {
85+
commits: ['3180bed'],
86+
},
87+
},
88+
hints: [],
89+
},
90+
},
91+
},
9292
}
9393

9494
export default basic

‎web-app/stories/utils/ApolloDecorator.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import client from '../../src/services/apollo'
33
import { ApolloProvider } from '@apollo/react-hooks'
44

55
function StorybookProvider({ children }) {
6-
return (
7-
<ApolloProvider client={client}>
8-
<Fragment>{children}</Fragment>
9-
</ApolloProvider>
10-
)
6+
return (
7+
<ApolloProvider client={client}>
8+
<Fragment>{children}</Fragment>
9+
</ApolloProvider>
10+
)
1111
}
1212

1313
export default story => {
14-
return <StorybookProvider>{story()}</StorybookProvider>
14+
return <StorybookProvider>{story()}</StorybookProvider>
1515
}

‎web-app/stories/utils/SideBarDecorator.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import * as React from 'react'
22

33
const styles = {
4-
container: {
5-
left: '25rem',
6-
position: 'absolute' as 'absolute',
7-
boxSizing: 'border-box' as 'border-box',
8-
borderLeft: '2px solid black',
9-
borderRight: '2px solid black',
10-
width: '50rem',
11-
height: window.innerHeight,
12-
},
4+
container: {
5+
left: '25rem',
6+
position: 'absolute' as 'absolute',
7+
boxSizing: 'border-box' as 'border-box',
8+
borderLeft: '2px solid black',
9+
borderRight: '2px solid black',
10+
width: '50rem',
11+
height: window.innerHeight,
12+
},
1313
}
1414

1515
const SideBarDecorator = storyFn => <div style={styles.container}>{storyFn()}</div>

0 commit comments

Comments
 (0)