Permalink
Browse files

Merge branch 'MDL-62381_moodle35' of https://github.com/Syxton/moodle

…into MOODLE_35_STABLE
  • Loading branch information...
dmonllao committed May 29, 2018
2 parents 52f03c6 + e0a8cfd commit c390ae4f8d55f95dfa8b7619aeccd906666f01e3
@@ -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.
@@ -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;}

0 comments on commit c390ae4

Please sign in to comment.