Refs #3510, #9113. Updated tinyMCE version in trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 16 insertions, 4 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
index 36f38aba2..03634668e 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
@@ -1,6 +1,7 @@
 body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}

 body {background:#FFF;}

 body.mceForceColors {background:#FFF; color:#000;}

+body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;}

 h1 {font-size: 2em}

 h2 {font-size: 1.5em}

 h3 {font-size: 1.17em}

@@ -9,6 +10,7 @@ h5 {font-size: .83em}
 h6 {font-size: .75em}

 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

 a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

 td.mceSelected, th.mceSelected {background-color:#3399ff !important}

 img {border:0;}

 table {cursor:default}

@@ -33,3 +35,13 @@ scrollbar-track-color:#F5F5F5;
 

 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

 font[face=mceinline] {font-family:inherit !important}

+

+.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}

+.mceItemShockWave {background-image:url(../../img/shockwave.gif)}

+.mceItemFlash {background-image:url(../../img/flash.gif)}

+.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}

+.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}

+.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}

+.mceItemVideo {background-image:url(../../img/video.gif)}

+.mceItemIframe {background-image:url(../../img/iframe.gif)}

+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
index 0049c7b3d..556b51071 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
@@ -4,8 +4,8 @@
 .defaultSkin table td {vertical-align:middle}

 

 /* Containers */

-.defaultSkin table {direction:ltr; background:#F0F0EE}

-.defaultSkin iframe {display:block; background:#FFF}

+.defaultSkin table {direction:ltr;background:transparent}

+.defaultSkin iframe {display:block;}

 .defaultSkin .mceToolbar {height:26px}

 .defaultSkin .mceLeft {text-align:left}

 .defaultSkin .mceRight {text-align:right}

@@ -20,9 +20,9 @@
 .defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}

 .defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}

 .defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}

-.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}

+.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}

 .defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}

-.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}

+.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}

 .defaultSkin .mceStatusbar div {float:left; margin:2px}

 .defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}

 .defaultSkin .mceStatusbar a:hover {text-decoration:underline}