diff --git a/lib/editor/tinymce/readme_moodle.txt b/lib/editor/tinymce/readme_moodle.txt index 429c5d0f604..6e3ca151f61 100644 --- a/lib/editor/tinymce/readme_moodle.txt +++ b/lib/editor/tinymce/readme_moodle.txt @@ -25,3 +25,6 @@ lib/editor/tinymce/tiny_mce/3.5.10/theme/advanced/skins/moodle/ TODO: * create some new automated script that sends other languages from upstream into AMOS + +HISTORY: +MDL-62381 - Icon sizing is being overwritten on images. \ No newline at end of file diff --git a/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css b/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css index f7e0741ae42..934ac45f2cd 100644 --- a/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css +++ b/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css @@ -80,7 +80,7 @@ .moodleSkin .mceToolbar .mceToolbarStart span, .moodleSkin .mceToolbar .mceToolbarEnd span {display:none;} .moodleSkin .mceToolbar .mceToolbarEndListBox span, .moodleSkin .mceToolbar .mceToolbarStartListBox span {display:none} .moodleSkin span.mceIcon {display:block;} -.moodleSkin img.mceIcon {display:block; width:16px; height:16px; padding: 2px 0 0 2px;} +.moodleSkin img.mceIcon:not(img) {display:block; width:16px; height:16px; padding: 2px 0 0 2px;} .moodleSkin td.mceCenter {text-align:center;} .moodleSkin td.mceCenter table {margin:0 auto; text-align:left;} .moodleSkin td.mceRight table {margin:0 0 0 auto;}