aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-29 07:15:07 -0400
committerCash Costello <cash.costello@gmail.com>2011-06-29 07:15:07 -0400
commitddf630c4b30a4264dfec23466b1c8dc8af886717 (patch)
treed5d9964352069d92b82d6dc718e609c022196b57
parent25688ea0e0f1a233b506cd2eb2b5acd84d552f3a (diff)
downloadelgg-ddf630c4b30a4264dfec23466b1c8dc8af886717.tar.gz
elgg-ddf630c4b30a4264dfec23466b1c8dc8af886717.tar.bz2
moved tinymce content css into its own directory
-rw-r--r--mod/tinymce/css/elgg_tinymce.css5
-rw-r--r--mod/tinymce/tinymce_content.css1
-rw-r--r--mod/tinymce/views/default/js/tinymce.php2
3 files changed, 6 insertions, 2 deletions
diff --git a/mod/tinymce/css/elgg_tinymce.css b/mod/tinymce/css/elgg_tinymce.css
new file mode 100644
index 000000000..503e78c35
--- /dev/null
+++ b/mod/tinymce/css/elgg_tinymce.css
@@ -0,0 +1,5 @@
+/* CSS for TinyMCE content iframe */
+body, td, pre {
+ color: #333;
+ font: 80%/1.4 "Lucida Grande",Verdana,sans-serif;
+} \ No newline at end of file
diff --git a/mod/tinymce/tinymce_content.css b/mod/tinymce/tinymce_content.css
deleted file mode 100644
index af7c9bde7..000000000
--- a/mod/tinymce/tinymce_content.css
+++ /dev/null
@@ -1 +0,0 @@
-body, td, pre {color:#000; font-family:"Lucida Grande",Arial,Tahoma,Verdana,sans-serif; font-size:13px; margin:8px;}
diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index 092983d1d..d195cc871 100644
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -66,7 +66,7 @@ elgg.tinymce.init = function() {
tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
});
},
- content_css: elgg.config.wwwroot + 'mod/tinymce/tinymce_content.css'
+ content_css: elgg.config.wwwroot + 'mod/tinymce/css/elgg_tinymce.css'
});
}