Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-62381_master' of https://github.com/Syxton/moodle
  • Loading branch information
David Monllao committed May 29, 2018
2 parents f1b701e + 197e714 commit 060884d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions lib/editor/tinymce/readme_moodle.txt
Expand Up @@ -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.
Expand Up @@ -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;}
Expand Down

0 comments on commit 060884d

Please sign in to comment.