Skip to content

Commit 39b13d9

Browse files
authored
Merge pull request #328 from coderoad/fix/icons
Fix/icons
2 parents 9b26bba + 1fa2004 commit 39b13d9

File tree

4 files changed

+7
-48
lines changed

4 files changed

+7
-48
lines changed

Diff for: web-app/src/components/Checkbox/index.tsx

-18
This file was deleted.

Diff for: web-app/src/components/Markdown/style.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
background-color: rgba(27, 31, 35, 0.05);
77
color: black;
88
border-radius: 0.3rem;
9-
padding: 0rem 0.15rem;
9+
padding: 0.15rem 0.3rem;
1010
font-size: 80%;
1111
white-space: nowrap;
1212
}

Diff for: web-app/src/containers/Tutorial/components/Step.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22
import * as T from 'typings'
33
import { css, jsx } from '@emotion/core'
4-
import Checkbox from '../../../components/Checkbox'
4+
import Icon from '../../../components/Icon'
55
import Markdown from '../../../components/Markdown'
66

77
interface Props {
@@ -20,8 +20,8 @@ const styles = {
2020
content: {
2121
margin: 0,
2222
},
23-
checkboxContainer: {
24-
paddingTop: 2,
23+
statusContainer: {
24+
paddingTop: 0,
2525
width: '1rem',
2626
},
2727
options: {
@@ -41,8 +41,9 @@ const Step = (props: Props) => {
4141
return (
4242
<div>
4343
<div css={styles.card}>
44-
<div css={styles.checkboxContainer}>
45-
<Checkbox status={props.status} />
44+
<div css={styles.statusContainer}>
45+
{props.status === 'ACTIVE' && <Icon type="success-filling" size="small" style={{ color: 'lightgrey' }} />}
46+
{props.status === 'COMPLETE' && <Icon type="success-filling" size="small" style={{ color: '#37B809' }} />}
4647
</div>
4748
<div>
4849
<Markdown>{props.content || ''}</Markdown>

Diff for: web-app/stories/Checkbox.stories.tsx

-24
This file was deleted.

0 commit comments

Comments
 (0)