vmario/Doodle3D-Core
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Core.git synced 2024-12-22 19:13:49 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "move iconloader""

Browse Source 
This reverts commit 6011b629e0.
This commit is contained in:
casperlamboo 2017-11-15 15:37:11 +01:00
parent 6011b629e0
commit a98fa80601
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.js
View File

@ -27,14 +27,10 @@ import React from 'react';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { render } from 'react-dom'; import { render } from 'react-dom';
import App from './src/components/App.js'; import App from './src/components/App.js';
import InlineIconsLoader from './src/components/InlineIconsLoader.js';
import sketcherReducer from './src/reducer/index.js'; import sketcherReducer from './src/reducer/index.js';
render(( render((
<Provider store={store}> <Provider store={store}>
<span style={{ height: '100%' }}>
<InlineIconsLoader />
<App /> <App />
</span>
</Provider> </Provider>
), document.getElementById('app')); ), document.getElementById('app'));

2
src/components/App.js
View File

@ -11,6 +11,7 @@ import Button from './Button.js';
import vlineImageURL from '../../img/vline.png'; import vlineImageURL from '../../img/vline.png';
import btnUndoImageURL from '../../img/mainmenu/btnUndo.png'; import btnUndoImageURL from '../../img/mainmenu/btnUndo.png';
import btnRedoImageURL from '../../img/mainmenu/btnRedo.png'; import btnRedoImageURL from '../../img/mainmenu/btnRedo.png';
import InlineIconsLoader from './InlineIconsLoader.js';
const styles = { const styles = {
container: { container: {
@ -66,6 +67,7 @@ class App extends React.Component {
const { classes, undo, redo } = this.props; const { classes, undo, redo } = this.props;
return ( return (
<div className={classes.container}> <div className={classes.container}>
<InlineIconsLoader />
<div className={classes.appContainer}> <div className={classes.appContainer}>
<D2Panel /> <D2Panel />
<div className={classes.vLine} /> <div className={classes.vLine} />