aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-01 15:32:20 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-01 15:32:20 +0000
commit655e2a2c1b88e7626164dd388e7711444f77e3f7 (patch)
treebafbc230da156651c3b9029d2af1c160b5869641
parente22e23e930ecac79489b9d20dc07eb8d7b3ac637 (diff)
downloadelgg-655e2a2c1b88e7626164dd388e7711444f77e3f7.tar.gz
elgg-655e2a2c1b88e7626164dd388e7711444f77e3f7.tar.bz2
Forgot to svn add tinymce_content.css. Added tinymce_content.css and reverted [6300] to allow for easier tinymce upgrades.
git-svn-id: http://code.elgg.org/elgg/trunk@6307 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/tinymce/tinymce_content.css1
-rw-r--r--mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css2
2 files changed, 2 insertions, 1 deletions
diff --git a/mod/tinymce/tinymce_content.css b/mod/tinymce/tinymce_content.css
new file mode 100644
index 000000000..af7c9bde7
--- /dev/null
+++ b/mod/tinymce/tinymce_content.css
@@ -0,0 +1 @@
+body, td, pre {color:#000; font-family:"Lucida Grande",Arial,Tahoma,Verdana,sans-serif; font-size:13px; margin:8px;}
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 b282d50d1..36f38aba2 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,4 +1,4 @@
-body, td, pre {color:#000; font-family:"Lucida Grande",Arial,Tahoma,Verdana,sans-serif; font-size:13px; margin:8px;}
+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;}
h1 {font-size: 2em}