MDL-46415 tinymce: SVG emoticons size

moodle · Oct 9, 2018 · b80f15e · b80f15e
1 parent 748bb77
commit b80f15e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/lib/editor/tinymce/readme_moodle.txt b/lib/editor/tinymce/readme_moodle.txt
@@ -20,6 +20,7 @@ Changes:
 - lib/editor/tinymce/tiny_mce/3.5.11/plugins/fullscreen/editor_plugin_src.js:31-33 - Added checks to see if required functions exist.
   After these changes you need to use uglifier to compress the js into lib/editor/tinymce/tiny_mce/3.5.11/plugins/fullscreen/editor_plugin.js
   (I used "uglifyjs editor_plugin_src.js -c -m -v -o editor_plugin.js")
+- lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/content.css:54-57 and lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/dialog.css:119 - Added styles to let SVG icons have 16px height and 16px width.
 
 Copy the moodle skin to the new version:
 lib/editor/tinymce/tiny_mce/3.5.10/theme/advanced/skins/moodle/

diff --git a/lib/editor/tinymce/styles.css b/lib/editor/tinymce/styles.css
@@ -22,7 +22,3 @@
 .mceToolbar td {
     box-sizing: content-box;
 }
-
-img.emoticon {
-    width: 16px;
-}
diff --git a/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/content.css b/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/content.css
@@ -51,3 +51,7 @@ font[face=mceinline] {font-family:inherit !important}
 #tinymce[dir=rtl] ol {
     margin: 0 25px 10px 0;
 }
+img.icon.emoticon {
+    height: 16px;
+    width: 16px;
+}
diff --git a/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/dialog.css b/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/dialog.css
@@ -116,3 +116,4 @@ h3 {font-size:14px;}
 #colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
 #colorpicker #colornamecontainer {margin-top:5px;}
 #colorpicker #picker_panel fieldset {margin:auto;width:325px;}
+img.icon.emoticon {height:16px;width:16px;}