Commit662d1ca

committed

Merge branch 'update-pkg' into dev

2 parents76482d5 +45cd4ca commit662d1caCopy full SHA for 662d1ca

File tree

+521

-436

lines changed

+521

-436

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,11 @@ let StateTreeWithNoSSR = null`
`10`	`10`	`// example: https://github.com/zeit/next.js/issues/219`
`11`	`11`	`exportdefaultclassStateViewerextendsReact.Component{`
`12`	`12`	`componentDidMount(){`
`13`		`-StateTreeWithNoSSR=dynamic(import('./StateTree'),{ssr:false})`
	`13`	`+// StateTreeWithNoSSR = dynamic(import('./StateTree'), { ssr: false })`
	`14`	`+StateTreeWithNoSSR=dynamic({`
	`15`	`+loader:()=>import('./StateTree'),`
	`16`	`+ssr:false,`
	`17`	`+})`
`14`	`18`	`}`
`15`	`19`
`16`	`20`	`render(){`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,12 @@ import * as logic from './logic'`
`37`	`37`	`constdebug=makeDebugger('C:Preview')`
`38`	`38`	`/* eslint-enable no-unused-vars */`
`39`	`39`
`40`		`-constDynamicTypeWriter=dynamic(import('../TypeWriter'),{`
	`40`	`+constDynamicTypeWriter=dynamic({`
	`41`	`+loader:()=>import('../TypeWriter'),`
`41`	`42`	`/* eslint-disable */`
`42`	`43`	`loading:()=><TypeWriterLoading/>,`
`43`	`44`	`/* eslint-enable */`
	`45`	`+srr:false,`
`44`	`46`	`})`
`45`	`47`
`46`	`48`	`constCloseBtn=({ type})=>(`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -107,7 +107,7 @@ export const ExploreIcon = styled(Img)`
`107`	`107`	`margin-top: -1px;`
`108`	`108`	`
`109`	`109`
`110`		-exportconstMenuItem=styled.ul`
	`110`	+exportconstMenuItem=styled.div`
`111`	`111`	`margin-top: 0px;`
`112`	`112`	`left: 0;`
`113`	`113`	`position: relative;`
@@ -116,7 +116,7 @@ export const MenuItem = styled.ul`
`116`	`116`	`overflow-y: scroll;`
`117`	`117`	`transition: left 0.2s;`
`118`	`118`	`
`119`		-exportconstMenuItemWrapper=styled.li`
	`119`	+exportconstMenuItemWrapper=styled.div`
`120`	`120`	`display: block;`
`121`	`121`	`&:hover {`
`122`	`122`	`background:${theme('sidebar.menuHover')};`

Lines changed: 0 additions & 186 deletions

This file was deleted.

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,14 @@ import { ThemeProvider } from 'styled-components'`
`11`	`11`	`import{storePlug}from'../../utils'`
`12`	`12`
`13`	`13`	`importAntOverWritefrom'./AntOverWrite'`
`14`		`-importNormalizeStylefrom'./NormalizeStyle'`
`15`	`14`	`// import MarkDownStyle from './MarkDownStyle'`
`16`	`15`	`importCodeHighlightfrom'./CodeHighlight'`
`17`		`-`
`18`		`-// TODO: mv MarkDownStyle && CodeHighlight to it's own container`
	`16`	`+import'./normalize.css'`
`19`	`17`
`20`	`18`	`constThemeObserver=({ children, theme})=>(`
`21`	`19`	`<ThemeProvidertheme={theme.themeData}>`
`22`	`20`	`<AntOverWrite>`
`23`	`21`	`<CodeHighlight>`
`24`		`-<styleglobaljsx>`
`25`		`-{NormalizeStyle}`
`26`		`-</style>`
`27`	`22`	<styleglobaljsx>{`
`28`	`23`	`html {`
`29`	`24`	`background-color:${theme.themeData.htmlBg};`

Comments

(0)