Skip to content

Feature/theme #404

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 8 commits into from
Jul 25, 2020
Merged

Feature/theme #404

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49083dc
add default theme variables
ShMcK Jul 24, 2020
2d2e1ad
setup theme
ShMcK Jul 24, 2020
d59b0e1
theme progress
ShMcK Jul 24, 2020
4c59200
theme migration progress 2
ShMcK Jul 24, 2020
6f4fc38
fix hint story
ShMcK Jul 24, 2020
ffac6b4
update styles
ShMcK Jul 24, 2020
9aa6a1b
fix width scroll issue (except review page)
ShMcK Jul 25, 2020
e94b95c
fix footer height
ShMcK Jul 25, 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
Prev Previous commit
fix footer height 
Signed-off-by: shmck <[email protected]>
  • Loading branch information
@ShMcK
ShMcK committed Jul 25, 2020
commit e94b95cdee7ecac303482e69ff4a6f11f2af0b74
4 changes: 2 additions & 2 deletions web-app/src/containers/SelectTutorial/TutorialOverview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ const Summary = (props: Props) => (
</div>
</div>

<div css={styles.footer}>
<footer css={styles.footer}>
{/* TODO Add back button */}
<Button type="primary" onClick={props.onNext}>
Start
</Button>
</div>
</footer>
</div>
)

Expand Down
18 changes: 9 additions & 9 deletions web-app/src/containers/Tutorial/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const styles = {
flexDirection: 'row' as 'row',
justifyContent: 'space-between',
alignItems: 'center',
height: '2rem',
height: theme['$footer-height'],
backgroundColor: 'black',
fontSize: '1rem',
lineHeight: '1rem',
Expand All @@ -70,21 +70,21 @@ const styles = {
right: 0,
zIndex: 1000,
},
processes: {
processes: (theme: Theme) => ({
padding: '0 1rem',
position: 'fixed' as 'fixed',
bottom: '2rem',
bottom: theme['$footer-height'],
left: 0,
right: 0,
top: 'auto',
},
testMessage: {
}),
testMessage: (theme: Theme) => ({
position: 'absolute' as 'absolute',
top: 'auto',
bottom: '2rem',
bottom: theme['$footer-height'],
left: '5px',
right: '5px',
},
}),
}

interface PageProps {
Expand Down Expand Up @@ -163,7 +163,7 @@ const TutorialPage = (props: PageProps) => {
/>
</div>
) : (
<div css={styles.footer}>
<footer css={styles.footer}>
{/* Process Modal */}
{processes.length > 0 && (
<div css={styles.processes}>
Expand Down Expand Up @@ -216,7 +216,7 @@ const TutorialPage = (props: PageProps) => {
<StepProgress current={stepIndex + 1} max={level.steps.length} />
) : null}
</div>
</div>
</footer>
)}
<SideMenu visible={menuVisible} toggleVisible={setMenuVisible} page={page} setPage={setPage} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/styles/theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const theme = {
'$shadow-3-right': '4px 0px 10px 0px rgba(0, 0, 0, 0.1)',
'$shadow-3-down': '0px 4px 10px 0px rgba(0, 0, 0, 0.1)',
'$shadow-3-left': '-4px 0px 10px 0px rgba(0, 0, 0, 0.1)',
'$footer-height': '3rem',
'$footer-height': '2.2rem',
'$nav-height': '2rem',
}

Expand Down