Skip to content

Icons, Fonts & Notifications #102

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 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 12 commits into from
Feb 2, 2020
Prev Previous commit
Next Next commit
cleanup button styles
  • Loading branch information
ShMcK committed Feb 2, 2020
commit 5a6120bbe4bb350676f4fffd7326e10a91f10ec7
11 changes: 10 additions & 1 deletion web-app/src/components/Button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,19 @@ interface Props {
disabled?: boolean
type?: 'primary' | 'secondary' | 'normal'
onClick?: () => void
size?: 'small' | 'medium' | 'large'
iconSize?: 'xxs' | 'xs' | 'small' | 'medium' | 'large' | 'xl' | 'xxl' | 'xxxl'
}

const Button = (props: Props) => (
<AlifdButton onClick={props.onClick} type={props.type} disabled={props.disabled} style={props.style}>
<AlifdButton
onClick={props.onClick}
type={props.type}
disabled={props.disabled}
style={props.style}
size={props.size}
iconSize={props.iconSize}
>
{props.children}
</AlifdButton>
)
Expand Down
8 changes: 7 additions & 1 deletion web-app/src/containers/Overview/OverviewPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react'
import * as G from 'typings/graphql'
import Button from '../../components/Button'
import Icon from '../../components/Icon'
import Markdown from '../../components/Markdown'

const footerHeight = '3rem'
Expand All @@ -23,11 +24,13 @@ const styles = {
fontSize: '1rem',
},
header: {
display: 'flex',
height: '2rem',
backgroundColor: '#EBEBEB',
fontSize: '1rem',
lineHeight: '1rem',
padding: '10px 1rem',
alignItems: 'center',
},
levelList: {
padding: '0rem 1rem',
Expand Down Expand Up @@ -61,7 +64,10 @@ const Summary = ({ title, description, levels, onNext, onBack }: Props) => (
<div css={styles.page}>
<div>
<div css={styles.header}>
<button onClick={onBack}>Back</button>
<button onClick={onBack}>
<Icon type="arrow-left" size="xxs" />
</button>
<span>&nbsp;&nbsp;</span>
<span>CodeRoad</span>
</div>
<div css={styles.summary}>
Expand Down