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

fix other merge conflict errors

Browse source
This commit is contained in:
Cassie Tarakajian 2017-10-12 15:38:02 -04:00
parent 53f7217786
commit 0989ff29eb
4 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/constants.js
View file

@ -130,6 +130,3 @@ export const HIDE_HELP_MODAL = 'HIDE_HELP_MODAL';
export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING'; export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING';
export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING'; export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING';
export const SET_ASSETS = 'SET_ASSETS'; export const SET_ASSETS = 'SET_ASSETS';
export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING';
export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING';

5
client/modules/IDE/pages/IDEView.jsx
View file

@ -690,13 +690,10 @@ IDEView.propTypes = {
persistState: PropTypes.func.isRequired, persistState: PropTypes.func.isRequired,
showHelpModal: PropTypes.func.isRequired, showHelpModal: PropTypes.func.isRequired,
hideHelpModal: PropTypes.func.isRequired, hideHelpModal: PropTypes.func.isRequired,
<<<<<<< HEAD
showRuntimeErrorWarning: PropTypes.func.isRequired, showRuntimeErrorWarning: PropTypes.func.isRequired,
hideRuntimeErrorWarning: PropTypes.func.isRequired hideRuntimeErrorWarning: PropTypes.func.isRequired,
=======
startSketch: PropTypes.func.isRequired, startSketch: PropTypes.func.isRequired,
startAccessibleSketch: PropTypes.func.isRequired startAccessibleSketch: PropTypes.func.isRequired
>>>>>>> master
}; };
function mapStateToProps(state) { function mapStateToProps(state) {

25
client/styles/components/_editor.scss
View file

@ -27,31 +27,6 @@ pre.CodeMirror-line {
padding-left: #{5 / $base-font-size}rem; padding-left: #{5 / $base-font-size}rem;
} }
.CodeMirror-activeline-background {
background-color: rgba(0,0,0,0.025) !important;
}
.CodeMirror-linebackground {
}
.line-runtime-error {
background-color: #ffaaaa !important;
border-radius: 5px;
}
.CodeMirror-guttermarker-subtle {
}
.CodeMirror-foldgutter-folded {
}
.CodeMirror-foldgutter-open {
}
.CodeMirror-gutter-wrapper { .CodeMirror-gutter-wrapper {
right: 100%; right: 100%;
top: 0; top: 0;