moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-46415 tinymce: SVG emoticons size

Browse source
This commit is contained in:
Andreas Grähn 2018-10-09 12:05:51 +02:00 • committed by Luca Bösch
parent 748bb77266
commit b80f15efca
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/editor/tinymce/readme_moodle.txt
View file

@ -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. - 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 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") (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: Copy the moodle skin to the new version:
lib/editor/tinymce/tiny_mce/3.5.10/theme/advanced/skins/moodle/ lib/editor/tinymce/tiny_mce/3.5.10/theme/advanced/skins/moodle/

4
lib/editor/tinymce/styles.css
View file

@ -22,7 +22,3 @@
.mceToolbar td { .mceToolbar td {
box-sizing: content-box; box-sizing: content-box;
} }
img.emoticon {
width: 16px;
}

4
lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/content.css
View file

@ -51,3 +51,7 @@ font[face=mceinline] {font-family:inherit !important}
#tinymce[dir=rtl] ol { #tinymce[dir=rtl] ol {
margin: 0 25px 10px 0; margin: 0 25px 10px 0;
} }
img.icon.emoticon {
height: 16px;
width: 16px;
}

1
lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/dialog.css
View file

@ -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 #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
#colorpicker #colornamecontainer {margin-top:5px;} #colorpicker #colornamecontainer {margin-top:5px;}
#colorpicker #picker_panel fieldset {margin:auto;width:325px;} #colorpicker #picker_panel fieldset {margin:auto;width:325px;}
img.icon.emoticon {height:16px;width:16px;}