Commitefa7580

authored

Merge pull requestcoderoad#75 from ShMcK/feature/minor-fixes

Feature/minor fixes

2 parents35cd00f +0041ef1 commitefa7580Copy full SHA for efa7580

File tree

+42

-9

lines changed

+42

-9

lines changed

Lines changed: 28 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,22 +10,49 @@ import './prism'`
`10`	`10`	`// markdown highlighter instance`
`11`	`11`	`constmd:MarkdownIt=newMarkdownIt({`
`12`	`12`	`breaks:true,`
`13`		`-// highlight: syntaxHighlight,`
`14`	`13`	`html:true,`
`15`	`14`	`linkify:true,`
`16`	`15`	`})`
`17`	`16`	`// add emoji: https://github.com/markdown-it/markdown-it-emoji`
`18`	`17`	`.use(markdownEmoji)`
	`18`	`+// add syntax highlighting through prism`
`19`	`19`	`.use(prism,{`
`20`	`20`	`defaultLanguage:'js',`
`21`	`21`	`})`
`22`	`22`
	`23`	`+// const mdFeatures = [`
	`24`	`+// 'table',`
	`25`	`+// 'code',`
	`26`	`+// 'fence',`
	`27`	`+// 'blockquote',`
	`28`	`+// 'hr',`
	`29`	`+// 'list',`
	`30`	`+// 'reference',`
	`31`	`+// 'heading',`
	`32`	`+// 'lheading',`
	`33`	`+// 'html_block',`
	`34`	`+// 'paragraph',`
	`35`	`+// 'html_inline',`
	`36`	`+// 'autolink',`
	`37`	`+// 'link',`
	`38`	`+// 'image',`
	`39`	`+// ]`
	`40`	`+`
	`41`	`+// TODO: markdownIt with rules disabling most features`
	`42`	`+// const minimalMarkdownIt = new MarkdownIt({`
	`43`	`+// breaks: false,`
	`44`	`+// html: true,`
	`45`	`+// linkify: false,`
	`46`	`+// }).disable(mdFeatures)`
	`47`	`+`
`23`	`48`	`interfaceProps{`
`24`	`49`	`children:string`
	`50`	`+minimal?:boolean`
`25`	`51`	`}`
`26`	`52`
`27`	`53`	`constMarkdown=(props:Props)=>{`
`28`	`54`	`lethtml:string`
	`55`	`+// TODO: set md to minimal rule set if specified`
`29`	`56`	`try{`
`30`	`57`	`html=md.render(props.children)`
`31`	`58`	`}catch(error){`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import*asReactfrom'react'`
`2`	`2`	`import{css,jsx}from'@emotion/core'`
`3`	`3`	`importCardfrom'../../../components/Card'`
	`4`	`+importMarkdownfrom'../../../components/Markdown'`
`4`	`5`
`5`	`6`	`conststyles={`
`6`	`7`	`card:{`
`@@ -39,7 +40,7 @@ const LanguageIcon = () => (`
`39`	`40`	`constTutorialItem=(props:Props)=>(`
`40`	`41`	`<CardonClick={props.onSelect}css={styles.card}>`
`41`	`42`	`<h3>{props.title\|\|'Title'}</h3>`
`42`		`-<p>{props.description\|\|'Description'}</p>`
	`43`	`+<Markdownminimal>{props.description\|\|'Description'}</Markdown>`
`43`	`44`	`<divcss={styles.languages}>`
`44`	`45`	`<LanguageIcon/>`
`45`	`46`	`</div>`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,15 @@ import * as G from 'typings/graphql'`
`3`	`3`	`importButtonfrom'../../components/Button'`
`4`	`4`	`importMarkdownfrom'../../components/Markdown'`
`5`	`5`
	`6`	`+constfooterHeight=50`
	`7`	`+`
`6`	`8`	`conststyles={`
`7`	`9`	`page:{`
`8`	`10`	`position:'relative'as'relative',`
`9`	`11`	`display:'flex'as'flex',`
`10`	`12`	`flexDirection:'column'as'column',`
`11`	`13`	`width:'100%',`
	`14`	`+paddingBottom:footerHeight,`
`12`	`15`	`},`
`13`	`16`	`summary:{`
`14`	`17`	`padding:'0rem 1rem 1rem 1rem',`
`@@ -38,7 +41,7 @@ const styles = {`
`38`	`41`	`flexDirection:'row'as'row',`
`39`	`42`	`alignItems:'center'as'center',`
`40`	`43`	`justifyContent:'flex-end'as'flex-end',`
`41`		`-height:'50px',`
	`44`	`+height:footerHeight,`
`42`	`45`	`padding:'1rem',`
`43`	`46`	`paddingRight:'2rem',`
`44`	`47`	`backgroundColor:'black',`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const styles = {`
`14`	`14`	`display:'flex'as'flex',`
`15`	`15`	`flexDirection:'column'as'column',`
`16`	`16`	`padding:0,`
`17`		`-paddingBottom:'36px',`
	`17`	`+paddingBottom:72,`
`18`	`18`	`height:'auto',`
`19`	`19`	`width:'100%',`
`20`	`20`	`},`
`@@ -42,18 +42,20 @@ const styles = {`
`42`	`42`	`},`
`43`	`43`	`processes:{`
`44`	`44`	`padding:'0 1rem',`
`45`		`-position:'absolute'as'absolute',`
`46`		`-bottom:'36px',`
	`45`	`+position:'fixed'as'fixed',`
	`46`	`+bottom:36,`
	`47`	`+left:0,`
	`48`	`+right:0,`
`47`	`49`	`},`
`48`	`50`	`footer:{`
`49`	`51`	`display:'flex'as'flex',`
`50`	`52`	`flexDirection:'row'as'row',`
`51`	`53`	`justifyContent:'space-between',`
`52`	`54`	`alignItems:'center',`
`53`		`-height:'36px',`
	`55`	`+height:36,`
`54`	`56`	`backgroundColor:'black',`
`55`		`-fontSize:'16px',`
`56`		`-lineHeight:'16px',`
	`57`	`+fontSize:16,`
	`58`	`+lineHeight:16,`
`57`	`59`	`padding:'10px 1rem',`
`58`	`60`	`position:'fixed'as'fixed',`
`59`	`61`	`bottom:0,`

Comments

(0)