mirror of
https://github.com/Doodle3D/Doodle3D-Core.git
synced 2025-01-22 00:55:09 +01:00
Revert "Revert "move iconloader""
This reverts commit 6011b629e0e1c79826dee00a30ee82ee7e3910cd.
This commit is contained in:
parent
6011b629e0
commit
a98fa80601
6
index.js
6
index.js
@ -27,14 +27,10 @@ import React from 'react';
|
||||
import { Provider } from 'react-redux';
|
||||
import { render } from 'react-dom';
|
||||
import App from './src/components/App.js';
|
||||
import InlineIconsLoader from './src/components/InlineIconsLoader.js';
|
||||
import sketcherReducer from './src/reducer/index.js';
|
||||
|
||||
render((
|
||||
<Provider store={store}>
|
||||
<span style={{ height: '100%' }}>
|
||||
<InlineIconsLoader />
|
||||
<App />
|
||||
</span>
|
||||
<App />
|
||||
</Provider>
|
||||
), document.getElementById('app'));
|
||||
|
@ -11,6 +11,7 @@ import Button from './Button.js';
|
||||
import vlineImageURL from '../../img/vline.png';
|
||||
import btnUndoImageURL from '../../img/mainmenu/btnUndo.png';
|
||||
import btnRedoImageURL from '../../img/mainmenu/btnRedo.png';
|
||||
import InlineIconsLoader from './InlineIconsLoader.js';
|
||||
|
||||
const styles = {
|
||||
container: {
|
||||
@ -66,6 +67,7 @@ class App extends React.Component {
|
||||
const { classes, undo, redo } = this.props;
|
||||
return (
|
||||
<div className={classes.container}>
|
||||
<InlineIconsLoader />
|
||||
<div className={classes.appContainer}>
|
||||
<D2Panel />
|
||||
<div className={classes.vLine} />
|
||||
|
Loading…
x
Reference in New Issue
Block a user