Skip to content

Fix/alignment #152

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 22, 2020
Merged

Fix/alignment #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b67d51
fix start page alignment & text
ShMcK Mar 22, 2020
e36650b
add padding to bottom of summary page
ShMcK Mar 22, 2020
e2bb75d
fix overview page meta alignment
ShMcK Mar 22, 2020
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
17 changes: 10 additions & 7 deletions web-app/src/containers/Overview/OverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const styles = {
cursor: 'pointer',
},
content: {
paddingBottom: '3rem',
paddingBottom: '5rem',
},
header: {
color: 'white',
Expand All @@ -40,6 +40,11 @@ const styles = {
description: {
fontSize: '1rem',
},
meta: {
display: 'flex' as 'flex',
flexDirection: 'row' as 'row',
flexWrap: 'wrap' as 'wrap',
},
levelList: {
padding: '0rem 1rem',
},
Expand Down Expand Up @@ -88,10 +93,10 @@ const Summary = (props: Props) => (
</div>
<h1 css={styles.title}>{props.title}</h1>
<h3>{props.description}</h3>
<h4>
<span css={{ marginRight: '2rem' }}>Created by {props.createdBy.name}</span>
<span>Last updated {moment(props.updatedAt).format('M/YYYY')}</span>
</h4>
<h5 css={styles.meta}>
<div css={{ marginRight: '2rem' }}>Created by {props.createdBy.name}</div>
<div>Last updated {moment(props.updatedAt).format('M/YYYY')}</div>
</h5>
</div>
<div>
<div css={styles.levelList}>
Expand All @@ -110,8 +115,6 @@ const Summary = (props: Props) => (
</div>
</div>

<div css={{ height: '3rem ' }} />

<div css={styles.footer}>
{/* TODO Add back button */}
<Button type="primary" onClick={props.onNext}>
Expand Down
8 changes: 4 additions & 4 deletions web-app/src/containers/Start/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const styles = {
},
subtitle: {
fontSize: '1.3rem',
textAlign: 'center' as 'center',
},
options: {
flex: 1,
Expand All @@ -54,11 +55,10 @@ export const StartPage = (props: Props) => (
<BetaBadge>
<span css={styles.title}>CodeRoad</span>
</BetaBadge>
<h3 css={styles.subtitle}>Play Interactive Coding Tutorials in VSCode</h3>
<p>Learn by coding in a real environment.</p>
<h3 css={styles.subtitle}>Play Tutorials in VSCode</h3>
<p>Learn in a real environment.</p>
<p>Instant feedback on save.</p>
<p>Progress saves to Git.</p>
<p>Build your portfolio as you learn.</p>
<p>Build your portfolio and Git timeline.</p>
</div>

<div css={styles.options}>
Expand Down