Commitaa3ef40

authored

Merge branch 'master' into master

2 parents3670226 +2e56203 commitaa3ef40Copy full SHA for aa3ef40

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,10 @@ import ReactDOM from 'react-dom';`
`3`	`3`	`importLoaderfrom'uielements/loader/loader.component';`
`4`	`4`	`constApp=React.lazy(()=>import('./src/app'));`
`5`	`5`
`6`		`-ReactDOM.render(<Suspensefallback={<Loader/>}><App/></Suspense>,document.getElementById('root'));`
	`6`	`+constIndex=()=>(`
	`7`	`+<Suspensefallback={<Loader/>}>`
	`8`	`+<App/>`
	`9`	`+</Suspense>`
	`10`	`+);`
	`11`	`+`
	`12`	`+ReactDOM.render(<Index/>,document.getElementById('root'));`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"main":"index.js",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"build":"webpack ---config ./config/webpack.prod.config.js",`
`8`		`-"dev":"webpack-dev-server --config ./config/webpack.dev.config.js",`
	`8`	`+"dev":"webpack-dev-server --config ./config/webpack.dev.config.js --open",`
`9`	`9`	`"lint":"./node_modules/.bin/eslint --ext .js,.jsx src/",`
`10`	`10`	`"test":"jest --collect-coverage",`
`11`	`11`	`"test:watch":"jest --watch"`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,23 @@ body {`
`20`	`20`
`21`	`21`	`.App--Image {`
`22`	`22`	`height:200px;`
	`23`	`+animation:rotation10sinfinitelinear;`
	`24`	`+-webkit-animation:rotation10sinfinitelinear;`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`.App--Title {`
`26`	`28`	`font-size:2rem;`
`27`	`29`	`}`
`28`	`30`	`}`
	`31`	`+`
	`32`	`+@keyframesrotation {`
	`33`	`+from {`
	`34`	`+-webkit-transform:rotate(0deg);`
	`35`	`+transform:rotate(0deg);`
	`36`	`+ }`
	`37`	`+to {`
	`38`	`+-webkit-transform:rotate(359deg);`
	`39`	`+transform:rotate(359deg);`
	`40`	`+ }`
	`41`	`+}`
	`42`	`+`

Comments

(0)