Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

fix styles#59

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.

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

Already on GitHub?Sign in to your account

Merged
ShMcK merged 1 commit intomasterfromfeature/fix-styles
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
4 changes: 2 additions & 2 deletionsweb-app/src/containers/Overview/OverviewPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,7 @@ const styles = {
position: 'relative' as 'relative',
display: 'flex' as 'flex',
flexDirection: 'column' as 'column',
justifyContent: 'space-between',
width: '100%',
height: '100%',
},
summary: {
padding: '0rem 1rem 1rem 1rem',
Expand All@@ -33,6 +31,8 @@ const styles = {
padding: '0rem 1rem',
},
options: {
position: 'absolute' as 'absolute',
bottom: 0,
display: 'flex' as 'flex',
flexDirection: 'row' as 'row',
alignItems: 'center' as 'center',
Expand Down
6 changes: 4 additions & 2 deletionsweb-app/src/containers/Tutorial/LevelPage/Level.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,10 +12,8 @@ const styles = {
position: 'relative' as 'relative',
display: 'flex' as 'flex',
flexDirection: 'column' as 'column',
justifyContent: 'space-between',
padding: 0,
width: '100%',
height: '100%',
},
header: {
height: '36px',
Expand All@@ -41,13 +39,17 @@ const styles = {
},
processes: {
padding: '0 1rem',
position: 'absolute' as 'absolute',
bottom: '36px',
},
footer: {
height: '36px',
backgroundColor: 'black',
fontSize: '16px',
lineHeight: '16px',
padding: '10px 1rem',
position: 'absolute' as 'absolute',
bottom: 0,
color: 'white',
width: '100%',
},
Expand Down
21 changes: 14 additions & 7 deletionsweb-app/src/styles/index.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
@import '~@alifd/next/dist/next.css';
@import '~@alifd/theme-4/dist/next.css';

html {
height: 100%;
width: 100%;
}

body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
'Droid Sans', 'Helvetica Neue', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
height: 100%;
width: 100%;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
'Droid Sans', 'Helvetica Neue', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}

p {
margin: 0;
margin: 0;
}
176 changes: 88 additions & 88 deletionsweb-app/stories/data/basic.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
import * as CR from 'typings'

const basic: CR.Tutorial = {
id: 'tutorialId',
meta: {
version: '0.1.0',
repo: 'https://github.com/ShMcK/coderoad-vscode.git',
createdBy: 'shmck',
createdAt: 'Sat, 11 May 2019 18:25:24 GMT',
updatedBy: 'shmck',
updatedAt: 'Sat, 11 May 2019 18:25:24 GMT',
contributors: ['shmck'],
languages: ['javascript'],
testRunner: 'jest',
},
data: {
summary: {
title: 'Basic Test',
description: 'A basic coding skills example',
levelList: ['level1Id'],
},
levels: {
level1Id: {
stageList: ['stage1Id'],
content: {
title: 'Sum Level',
text: 'A description of this stage',
},
},
},
stages: {
stage1Id: {
stepList: ['step1Id', 'step2Id', 'step3Id'],
content: {
title: 'Sum Stage',
text: 'A description of this stage',
},
},
},
steps: {
step1Id: {
content: {
title: 'Sum',
text: 'Write a function that adds two numbers together',
},
actions: {
setup: {
commits: ['430500f', '8383061'],
commands: ['npm install'],
files: ['src/sum.js'],
},
solution: {
commits: ['abbe136'],
},
},
hints: [],
},
step2Id: {
content: {
title: 'Multiply',
text: 'Write a function that multiplies two numbers together',
},
actions: {
setup: {
commits: ['9cbb518'],
files: ['src/multiply.js'],
},
solution: {
commits: ['5ae011f'],
},
},
hints: [],
},
step3Id: {
content: {
title: 'Divide',
text: 'Write a function that divides',
},
actions: {
setup: {
commits: ['70c774c'],
files: ['src/divide.js'],
},
solution: {
commits: ['3180bed'],
},
},
hints: [],
},
},
},
id: 'tutorialId',
meta: {
version: '0.1.0',
repo: 'https://github.com/ShMcK/coderoad-vscode.git',
createdBy: 'shmck',
createdAt: 'Sat, 11 May 2019 18:25:24 GMT',
updatedBy: 'shmck',
updatedAt: 'Sat, 11 May 2019 18:25:24 GMT',
contributors: ['shmck'],
languages: ['javascript'],
testRunner: 'jest',
},
data: {
summary: {
title: 'Basic Test',
description: 'A basic coding skills example',
levelList: ['level1Id'],
},
levels: {
level1Id: {
stageList: ['stage1Id'],
content: {
title: 'Sum Level',
text: 'A description of this stage',
},
},
},
stages: {
stage1Id: {
stepList: ['step1Id', 'step2Id', 'step3Id'],
content: {
title: 'Sum Stage',
text: 'A description of this stage',
},
},
},
steps: {
step1Id: {
content: {
title: 'Sum',
text: 'Write a function that adds two numbers together',
},
actions: {
setup: {
commits: ['430500f', '8383061'],
commands: ['npm install'],
files: ['src/sum.js'],
},
solution: {
commits: ['abbe136'],
},
},
hints: [],
},
step2Id: {
content: {
title: 'Multiply',
text: 'Write a function that multiplies two numbers together',
},
actions: {
setup: {
commits: ['9cbb518'],
files: ['src/multiply.js'],
},
solution: {
commits: ['5ae011f'],
},
},
hints: [],
},
step3Id: {
content: {
title: 'Divide',
text: 'Write a function that divides',
},
actions: {
setup: {
commits: ['70c774c'],
files: ['src/divide.js'],
},
solution: {
commits: ['3180bed'],
},
},
hints: [],
},
},
},
}

export default basic
12 changes: 6 additions & 6 deletionsweb-app/stories/utils/ApolloDecorator.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,13 @@ import client from '../../src/services/apollo'
import { ApolloProvider } from '@apollo/react-hooks'

function StorybookProvider({ children }) {
return (
<ApolloProvider client={client}>
<Fragment>{children}</Fragment>
</ApolloProvider>
)
return (
<ApolloProvider client={client}>
<Fragment>{children}</Fragment>
</ApolloProvider>
)
}

export default story => {
return <StorybookProvider>{story()}</StorybookProvider>
return <StorybookProvider>{story()}</StorybookProvider>
}
18 changes: 9 additions & 9 deletionsweb-app/stories/utils/SideBarDecorator.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
import * as React from 'react'

const styles = {
container: {
left: '25rem',
position: 'absolute' as 'absolute',
boxSizing: 'border-box' as 'border-box',
borderLeft: '2px solid black',
borderRight: '2px solid black',
width: '50rem',
height: window.innerHeight,
},
container: {
left: '25rem',
position: 'absolute' as 'absolute',
boxSizing: 'border-box' as 'border-box',
borderLeft: '2px solid black',
borderRight: '2px solid black',
width: '50rem',
height: window.innerHeight,
},
}

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

[8]ページ先頭

©2009-2025 Movatter.jp