Skip to content

Commit 1b7abcc

Browse files
committed
MC-4137: TinyMCE Issues within inline WYSIWYG
- Update lightgrey theme and add “magento” theme as legacy theme
1 parent dcb0f42 commit 1b7abcc

28 files changed

+3094
-3
lines changed

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ define([
193193
settings = {
194194
selector: '#' + this.getId(),
195195
theme: 'modern',
196+
skin: 'magento',
196197
'entity_encoding': 'raw',
197198
'convert_urls': false,
198199
'content_css': this.config.tinymce4['content_css'],
@@ -263,6 +264,10 @@ define([
263264
}
264265
};
265266

267+
if (this.config.skin) {
268+
settings.skin = this.config.skin;
269+
}
270+
266271
if (this.config.baseStaticUrl && this.config.baseStaticDefaultUrl) {
267272
settings['document_base_url'] = this.config.baseStaticUrl;
268273
}

lib/web/tiny_mce_4/skins/lightgray/content.inline.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce_4/skins/lightgray/content.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce_4/skins/lightgray/content.mobile.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

lib/web/tiny_mce_4/skins/lightgray/skin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce_4/skins/lightgray/skin.min.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce_4/skins/lightgray/skin.mobile.min.css

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)