r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
mathuramg 2016-07-13 12:07:05 -04:00
commit 0d9c3a29c8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/modules/IDE/components/Editor.js
View file

@ -12,7 +12,8 @@ class Editor extends React.Component {
lineNumbers: true, lineNumbers: true,
styleActiveLine: true, styleActiveLine: true,
inputStyle: 'contenteditable', inputStyle: 'contenteditable',
mode: 'javascript' mode: 'javascript',
lineWrapping: true
}); });
this._cm.on('change', () => { // eslint-disable-line this._cm.on('change', () => { // eslint-disable-line
// this.props.updateFileContent('sketch.js', this._cm.getValue()); // this.props.updateFileContent('sketch.js', this._cm.getValue());

5
client/styles/layout/_ide.scss
View file

@ -6,12 +6,13 @@
} }
.editor-holder { .editor-holder {
flex-grow: 1; flex: 1 0 0;
max-width: 45%;
height: 100%; height: 100%;
} }
.preview-frame { .preview-frame {
flex-grow: 1; flex: 1 0 0;
} }
.toolbar { .toolbar {