Merge branch 'master' into zrispo-feature-runtime-error-highlight

This commit is contained in:
Cassie Tarakajian 2017-10-12 16:23:31 -04:00
commit 24030ac7aa
2 changed files with 2 additions and 1 deletions

View File

@ -82,7 +82,7 @@ class Editor extends React.Component {
fixedGutter: false,
foldGutter: true,
foldOptions: { widget: '\u2026' },
gutters: ['CodeMirror-foldgutter'],
gutters: ['CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
keyMap: 'sublime',
highlightSelectionMatches: true, // highlight current search match
lint: {

View File

@ -38,6 +38,7 @@ pre.CodeMirror-line {
width: #{48 / $base-font-size}rem;
position: absolute;
height: 100%;
right: 100%;
}
.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {