grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pre-update

Browse Source
This commit is contained in:
Jaco Greeff 2017-05-24 14:05:34 +02:00
parent 368e3d1f51
commit d33d54dbf9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/dapps/console.js → js/src/dapps/console/index.js
View File

@ -29,14 +29,15 @@ import 'codemirror/addon/search/searchcursor';
import 'codemirror/keymap/sublime'; import 'codemirror/keymap/sublime';
import 'codemirror/lib/codemirror.css'; import 'codemirror/lib/codemirror.css';
import 'codemirror/mode/javascript/javascript'; import 'codemirror/mode/javascript/javascript';
// Custom codemirror style // Custom codemirror style
import './console/codemirror.css'; import './codemirror.css';
import Application from './console/Application'; import Application from './Application';
import '../../assets/fonts/Roboto/font.css'; import '@parity/shared/assets/fonts/Roboto/font.css';
import '../../assets/fonts/RobotoMono/font.css'; import '@parity/shared/assets/fonts/RobotoMono/font.css';
import './style.css'; import '../style.css';
ReactDOM.render( ReactDOM.render(
<AppContainer> <AppContainer>
@ -46,8 +47,8 @@ ReactDOM.render(
); );
if (module.hot) { if (module.hot) {
module.hot.accept('./console/Application/index.js', () => { module.hot.accept('./Application/index.js', () => {
require('./console/Application/index.js'); require('./Application/index.js');
ReactDOM.render( ReactDOM.render(
<AppContainer> <AppContainer>