Skip to content

Commit 3b90c9e

Browse files
committed
[#1522] Add updates to emmet config
1 parent b3af150 commit 3b90c9e

File tree

2 files changed

+41
-6
lines changed

2 files changed

+41
-6
lines changed

client/modules/IDE/components/Editor.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ class Editor extends React.Component {
110110
keyMap: 'sublime',
111111
highlightSelectionMatches: true, // highlight current search match
112112
matchBrackets: true,
113-
mode: 'text/html',
114113
emmet: {
115-
preview: true,
116-
markTagPairs: true
114+
preview: ['html'],
115+
markTagPairs: true,
116+
autoRenameTags: true
117117
},
118118
autoCloseBrackets: this.props.autocloseBracketsQuotes,
119119
styleSelectedText: true,

client/styles/components/_editor.scss

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,41 @@ pre.CodeMirror-line {
423423
margin-left: #{2 / $base-font-size}rem;
424424
}
425425

426-
.emmet-close-tag,.emmet-open-tag{
427-
text-decoration: underline;
428-
}
426+
/** Inline abbreviation preview */
427+
428+
.emmet-abbreviation-preview {
429+
@extend %modal;
430+
position: absolute;
431+
@include themify() {
432+
background: getThemifyVariable('background-color');
433+
}
434+
& .CodeMirror-lines {
435+
padding: 0;
436+
}
437+
& .CodeMirror {
438+
height: auto;
439+
max-width: #{400 / $base-font-size}rem;
440+
max-height: #{300 / $base-font-size}rem;
441+
border: none;
442+
}
443+
}
444+
445+
.emmet-abbreviation-preview:not(.has-error) .emmet-abbreviation-preview-error {
446+
display: none;
447+
}
448+
449+
.emmet-abbreviation-preview.has-error .CodeMirror {
450+
display: none;
451+
}
452+
453+
.emmet-abbreviation-preview .CodeMirror-cursors {
454+
visibility: hidden !important;
455+
}
456+
457+
.emmet-abbreviation-preview .emmet-error-snippet-message {
458+
padding: 5px;
459+
}
460+
461+
.emmet-open-tag, .emmet-close-tag {
462+
text-decoration: underline;
463+
}

0 commit comments

Comments
 (0)