Commit39b13d9

authored

Merge pull requestcoderoad#328 from coderoad/fix/icons

Fix/icons

2 parents9b26bba +1fa2004 commit39b13d9Copy full SHA for 39b13d9

File tree

-48

lines changed

-48

lines changed

Lines changed: 0 additions & 18 deletions

This file was deleted.

Lines changed: 1 addition & 1 deletion

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import*asReactfrom'react'`
`2`	`2`	`import*asTfrom'typings'`
`3`	`3`	`import{css,jsx}from'@emotion/core'`
`4`		`-importCheckboxfrom'../../../components/Checkbox'`
	`4`	`+importIconfrom'../../../components/Icon'`
`5`	`5`	`importMarkdownfrom'../../../components/Markdown'`
`6`	`6`
`7`	`7`	`interfaceProps{`
`@@ -20,8 +20,8 @@ const styles = {`
`20`	`20`	`content:{`
`21`	`21`	`margin:0,`
`22`	`22`	`},`
`23`		`-checkboxContainer:{`
`24`		`-paddingTop:2,`
	`23`	`+statusContainer:{`
	`24`	`+paddingTop:0,`
`25`	`25`	`width:'1rem',`
`26`	`26`	`},`
`27`	`27`	`options:{`
`@@ -41,8 +41,9 @@ const Step = (props: Props) => {`
`41`	`41`	`return(`
`42`	`42`	`<div>`
`43`	`43`	`<divcss={styles.card}>`
`44`		`-<divcss={styles.checkboxContainer}>`
`45`		`-<Checkboxstatus={props.status}/>`
	`44`	`+<divcss={styles.statusContainer}>`
	`45`	`+{props.status==='ACTIVE'&&<Icontype="success-filling"size="small"style={{color:'lightgrey'}}/>}`
	`46`	`+{props.status==='COMPLETE'&&<Icontype="success-filling"size="small"style={{color:'#37B809'}}/>}`
`46`	`47`	`</div>`
`47`	`48`	`<div>`
`48`	`49`	`<Markdown>{props.content\|\|''}</Markdown>`

Lines changed: 0 additions & 24 deletions

This file was deleted.

Comments

(0)