-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New version 3.4.1. Read more https://github.com/xdan/jodit/releases/t…
- Loading branch information
Showing
10 changed files
with
56 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,18 @@ | ||
/*! | ||
jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser | ||
Author: Chupurnov <[email protected]> (https://xdsoft.net/) | ||
Version: v3.4.0 | ||
Version: v3.4.1 | ||
Url: https://xdsoft.net/jodit/ | ||
License(s): MIT | ||
*/ | ||
.jodit-wysiwyg{ | ||
outline:0; | ||
} | ||
.jodit-wysiwyg::-moz-selection{ | ||
.jodit-wysiwyg::-moz-selection,.jodit-wysiwyg ::-moz-selection{ | ||
background:#b5d6fd; | ||
color:#4c4c4c; | ||
} | ||
.jodit-wysiwyg ::-moz-selection{ | ||
background:#b5d6fd; | ||
color:#4c4c4c; | ||
} | ||
.jodit-wysiwyg::selection{ | ||
background:#b5d6fd; | ||
color:#4c4c4c; | ||
} | ||
.jodit-wysiwyg ::selection{ | ||
.jodit-wysiwyg::selection,.jodit-wysiwyg ::selection{ | ||
background:#b5d6fd; | ||
color:#4c4c4c; | ||
} | ||
|
@@ -35,18 +27,6 @@ | |
position:relative; | ||
max-width:100%; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg p,.jodit-container:not(.jodit_inline) .jodit-wysiwyg pre{ | ||
margin:0 0 8px; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg h1,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h2,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h3,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h4,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h5{ | ||
margin-top:0; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg blockquote{ | ||
border-left:2px solid; | ||
margin-left:0; | ||
padding-left:calc(8px/2); | ||
color:#222; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg jodit-media{ | ||
position:relative; | ||
} | ||
|
@@ -554,6 +534,12 @@ svg.jodit-icon{ | |
position:static; | ||
width:auto; | ||
} | ||
.jodit_theme_dark .jodit-toolbar-collection_mode_horizontal:after{ | ||
background-color:#6b6b6b; | ||
} | ||
.jodit_theme_dark .jodit-toolbar-editor-collection_mode_horizontal:after{ | ||
background-color:#6b6b6b; | ||
} | ||
.jodit_theme_dark.jodit-container{ | ||
background-color:#575757; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/*! | ||
jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser | ||
Author: Chupurnov <[email protected]> (https://xdsoft.net/) | ||
Version: v3.4.0 | ||
Version: v3.4.1 | ||
Url: https://xdsoft.net/jodit/ | ||
License(s): MIT | ||
*/ | ||
|
@@ -78,12 +78,12 @@ | |
outline:0; | ||
} | ||
.jodit-wysiwyg::selection,.jodit-wysiwyg ::selection{ | ||
background:var(--jd-color-background-selection); | ||
color:var(--jd-color-selection); | ||
background:#b5d6fd; | ||
color:#4c4c4c; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg{ | ||
margin:0; | ||
padding:var(--jd-padding-default); | ||
padding:8px; | ||
outline:0; | ||
overflow-x:auto; | ||
position:relative; | ||
|
@@ -92,18 +92,6 @@ | |
position:relative; | ||
max-width:100%; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg p,.jodit-container:not(.jodit_inline) .jodit-wysiwyg pre{ | ||
margin:0 0 8px; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg h1,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h2,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h3,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h4,.jodit-container:not(.jodit_inline) .jodit-wysiwyg h5{ | ||
margin-top:0; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg blockquote{ | ||
border-left:2px solid; | ||
margin-left:0; | ||
padding-left:calc(var(--jd-padding-default)/2); | ||
color:var(--jd-color-text); | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-wysiwyg jodit-media{ | ||
position:relative; | ||
} | ||
|
@@ -495,7 +483,7 @@ svg.jodit-icon{ | |
.jodit-container:not(.jodit_inline){ | ||
border:1px solid var(--jd-color-border); | ||
border-radius:var(--jd-border-radius-default); | ||
background-color:var(--jd-color-background-default); | ||
background-color:#fff; | ||
} | ||
.jodit-container:not(.jodit_inline) .jodit-workplace{ | ||
border:0 solid var(--jd-color-border); | ||
|
@@ -531,6 +519,9 @@ svg.jodit-icon{ | |
.jodit_theme_dark{ | ||
--jd-color-border:#6b6b6b; | ||
} | ||
.jodit_theme_dark .jodit-toolbar-collection_mode_horizontal:after,.jodit_theme_dark .jodit-toolbar-editor-collection_mode_horizontal:after{ | ||
background-color:var(--jd-color-border); | ||
} | ||
.jodit_theme_dark.jodit-container,.jodit_theme_dark.jodit-container.jodit_disabled{ | ||
background-color:var(--jd-dark_background_color); | ||
} | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/*! | ||
jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser | ||
Author: Chupurnov <[email protected]> (https://xdsoft.net/) | ||
Version: v3.4.0 | ||
Version: v3.4.1 | ||
Url: https://xdsoft.net/jodit/ | ||
License(s): MIT | ||
*/ | ||
|
@@ -4404,7 +4404,7 @@ var View = (function (_super) { | |
var _this = _super.call(this) || this; | ||
_this.isView = true; | ||
_this.components = new Set(); | ||
_this.version = "3.4.0"; | ||
_this.version = "3.4.1"; | ||
_this.async = new async_1.Async(); | ||
_this.buffer = storage_1.Storage.makeStorage(); | ||
_this.__isFullSize = false; | ||
|
@@ -22437,7 +22437,10 @@ var placeholder = (function (_super) { | |
return dom_1.Dom.isEmptyTextNode(first); | ||
} | ||
if (!next && | ||
dom_1.Dom.each(first, function (elm) { return dom_1.Dom.isEmpty(elm) || dom_1.Dom.isTag(elm, 'br'); })) { | ||
dom_1.Dom.each(first, function (elm) { | ||
return !dom_1.Dom.isTag(elm, ['ul', 'li', 'ol']) && | ||
(dom_1.Dom.isEmpty(elm) || dom_1.Dom.isTag(elm, 'br')); | ||
})) { | ||
return true; | ||
} | ||
return false; | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters