Merge branch 'master' into zrispo-feature-runtime-error-highlight
This commit is contained in:
commit
24030ac7aa
2 changed files with 2 additions and 1 deletions
|
@ -82,7 +82,7 @@ class Editor extends React.Component {
|
||||||
fixedGutter: false,
|
fixedGutter: false,
|
||||||
foldGutter: true,
|
foldGutter: true,
|
||||||
foldOptions: { widget: '\u2026' },
|
foldOptions: { widget: '\u2026' },
|
||||||
gutters: ['CodeMirror-foldgutter'],
|
gutters: ['CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
|
||||||
keyMap: 'sublime',
|
keyMap: 'sublime',
|
||||||
highlightSelectionMatches: true, // highlight current search match
|
highlightSelectionMatches: true, // highlight current search match
|
||||||
lint: {
|
lint: {
|
||||||
|
|
|
@ -38,6 +38,7 @@ pre.CodeMirror-line {
|
||||||
width: #{48 / $base-font-size}rem;
|
width: #{48 / $base-font-size}rem;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
right: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
|
.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
|
||||||
|
|
Loading…
Reference in a new issue