Skip to content

Fix/icons #328

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 2 commits into from
May 10, 2020
Merged

Fix/icons #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aeaae7
fix inline code padding
ShMcK May 10, 2020
1fa2004
replace checkboxes with icons
ShMcK May 10, 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
18 changes: 0 additions & 18 deletions web-app/src/components/Checkbox/index.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion web-app/src/components/Markdown/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
background-color: rgba(27, 31, 35, 0.05);
color: black;
border-radius: 0.3rem;
padding: 0rem 0.15rem;
padding: 0.15rem 0.3rem;
font-size: 80%;
white-space: nowrap;
}
11 changes: 6 additions & 5 deletions web-app/src/containers/Tutorial/components/Step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import * as T from 'typings'
import { css, jsx } from '@emotion/core'
import Checkbox from '../../../components/Checkbox'
import Icon from '../../../components/Icon'
import Markdown from '../../../components/Markdown'

interface Props {
Expand All @@ -20,8 +20,8 @@ const styles = {
content: {
margin: 0,
},
checkboxContainer: {
paddingTop: 2,
statusContainer: {
paddingTop: 0,
width: '1rem',
},
options: {
Expand All @@ -41,8 +41,9 @@ const Step = (props: Props) => {
return (
<div>
<div css={styles.card}>
<div css={styles.checkboxContainer}>
<Checkbox status={props.status} />
<div css={styles.statusContainer}>
{props.status === 'ACTIVE' && <Icon type="success-filling" size="small" style={{ color: 'lightgrey' }} />}
{props.status === 'COMPLETE' && <Icon type="success-filling" size="small" style={{ color: '#37B809' }} />}
</div>
<div>
<Markdown>{props.content || ''}</Markdown>
Expand Down
24 changes: 0 additions & 24 deletions web-app/stories/Checkbox.stories.tsx
View file
Open in desktop

This file was deleted.