Merge bb00cf0a0e988b4c326881542eefd94a630b48f0 into 6abda7ab68cc20f4aca870eb243747951b90ab04

This commit is contained in:
Nabab 2017-09-25 02:38:27 +00:00 committed by GitHub
commit d5f7008136
2 changed files with 21 additions and 20 deletions

View File

@ -1,4 +1,4 @@
.CodeMirror { .simplemde-editor.CodeMirror {
height: auto; height: auto;
min-height: 300px; min-height: 300px;
border: 1px solid #ddd; border: 1px solid #ddd;
@ -9,11 +9,11 @@
z-index: 1; z-index: 1;
} }
.CodeMirror-scroll { .simplemde-editor .CodeMirror-scroll {
min-height: 300px min-height: 300px
} }
.CodeMirror-fullscreen { .simplemde-editor .CodeMirror-fullscreen {
background: #fff; background: #fff;
position: fixed !important; position: fixed !important;
top: 50px; top: 50px;
@ -24,11 +24,11 @@
z-index: 9; z-index: 9;
} }
.CodeMirror-sided { .simplemde-editor .CodeMirror-sided {
width: 50% !important; width: 50% !important;
} }
.editor-toolbar { .simplemde-editor .editor-toolbar {
position: relative; position: relative;
opacity: .6; opacity: .6;
-webkit-user-select: none; -webkit-user-select: none;
@ -270,59 +270,59 @@
padding: 5px; padding: 5px;
} }
.CodeMirror .CodeMirror-code .cm-tag { .simplemde-editor.CodeMirror .CodeMirror-code .cm-tag {
color: #63a35c; color: #63a35c;
} }
.CodeMirror .CodeMirror-code .cm-attribute { .simplemde-editor.CodeMirror .CodeMirror-code .cm-attribute {
color: #795da3; color: #795da3;
} }
.CodeMirror .CodeMirror-code .cm-string { .simplemde-editor.CodeMirror .CodeMirror-code .cm-string {
color: #183691; color: #183691;
} }
.CodeMirror .CodeMirror-selected { .simplemde-editor.CodeMirror .CodeMirror-selected {
background: #d9d9d9; background: #d9d9d9;
} }
.CodeMirror .CodeMirror-code .cm-header-1 { .simplemde-editor.CodeMirror .CodeMirror-code .cm-header-1 {
font-size: 200%; font-size: 200%;
line-height: 200%; line-height: 200%;
} }
.CodeMirror .CodeMirror-code .cm-header-2 { .simplemde-editor.CodeMirror .CodeMirror-code .cm-header-2 {
font-size: 160%; font-size: 160%;
line-height: 160%; line-height: 160%;
} }
.CodeMirror .CodeMirror-code .cm-header-3 { .simplemde-editor.CodeMirror .CodeMirror-code .cm-header-3 {
font-size: 125%; font-size: 125%;
line-height: 125%; line-height: 125%;
} }
.CodeMirror .CodeMirror-code .cm-header-4 { .simplemde-editor.CodeMirror .CodeMirror-code .cm-header-4 {
font-size: 110%; font-size: 110%;
line-height: 110%; line-height: 110%;
} }
.CodeMirror .CodeMirror-code .cm-comment { .simplemde-editor.CodeMirror .CodeMirror-code .cm-comment {
background: rgba(0, 0, 0, .05); background: rgba(0, 0, 0, .05);
border-radius: 2px; border-radius: 2px;
} }
.CodeMirror .CodeMirror-code .cm-link { .simplemde-editor.CodeMirror .CodeMirror-code .cm-link {
color: #7f8c8d; color: #7f8c8d;
} }
.CodeMirror .CodeMirror-code .cm-url { .simplemde-editor.CodeMirror .CodeMirror-code .cm-url {
color: #aab2b3; color: #aab2b3;
} }
.CodeMirror .CodeMirror-code .cm-strikethrough { .simplemde-editor.CodeMirror .CodeMirror-code .cm-strikethrough {
text-decoration: line-through; text-decoration: line-through;
} }
.CodeMirror .CodeMirror-placeholder { .simplemde-editor.CodeMirror .CodeMirror-placeholder {
opacity: .5; opacity: .5;
} }

View File

@ -1494,6 +1494,7 @@ SimpleMDE.prototype.render = function(el) {
placeholder: options.placeholder || el.getAttribute("placeholder") || "", placeholder: options.placeholder || el.getAttribute("placeholder") || "",
styleSelectedText: (options.styleSelectedText != undefined) ? options.styleSelectedText : true styleSelectedText: (options.styleSelectedText != undefined) ? options.styleSelectedText : true
}); });
this.codemirror.display.wrapper.className += ' simplemde-editor';
if(options.forceSync === true) { if(options.forceSync === true) {
var cm = this.codemirror; var cm = this.codemirror;
@ -2025,4 +2026,4 @@ SimpleMDE.prototype.toTextArea = function() {
} }
}; };
module.exports = SimpleMDE; module.exports = SimpleMDE;