From d15e5d0da563df83c54bb5a29d312634322f91cb Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 10 Oct 2018 17:40:47 -0400 Subject: [PATCH] fixes #715 in an extremely hacky way :woman_shrugging:, fixes another error in which when changing the font size, linting highlighting was misaligned --- client/modules/IDE/components/Editor.jsx | 2 ++ client/styles/components/_editor.scss | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/modules/IDE/components/Editor.jsx b/client/modules/IDE/components/Editor.jsx index 2e0845e6..c87ddc8a 100644 --- a/client/modules/IDE/components/Editor.jsx +++ b/client/modules/IDE/components/Editor.jsx @@ -103,6 +103,8 @@ class Editor extends React.Component { } }); + delete this._cm.options.lint.options.errors; + this._cm.setOption('extraKeys', { [`${metaKey}-Enter`]: () => null, [`Shift-${metaKey}-Enter`]: () => null, diff --git a/client/styles/components/_editor.scss b/client/styles/components/_editor.scss index ef380f30..2ee39f78 100644 --- a/client/styles/components/_editor.scss +++ b/client/styles/components/_editor.scss @@ -35,7 +35,7 @@ pre.CodeMirror-line { .CodeMirror-lint-marker-warning, .CodeMirror-lint-marker-error, .CodeMirror-lint-marker-multiple { background-image: none; - width: #{48 / $base-font-size}rem; + width: #{49 / $base-font-size}rem; position: absolute; height: 100%; right: 100%; @@ -56,8 +56,9 @@ pre.CodeMirror-line { .CodeMirror-gutter-elt:not(.CodeMirror-linenumber) { opacity: 0.3; - width: #{48 / $base-font-size}rem !important; + width: #{49 / $base-font-size}rem !important; height: 100%; + left: 49px !important; // background-color: rgb(255, 95, 82); }