Merged default font changes

diff --git a/lib/defaults.php b/lib/defaults.php
index d902c4799c24977d80602835bb603e9b2f7c6fff..a50269dcc861e08f03f51bc4d8cfa52ed17e2905 100644 (file)
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -20,11 +20,11 @@
        "enrol"                    => 'internal',
        "extendedusernamechars"    => false,
        "editorbackgroundcolor"    => '#ffffff',
-       "editorfontfamily"         => 'Times New Roman, Times',
+       "editorfontfamily"         => 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif',
        "editorfontsize"           => '',
        "editorkillword"           => 1,
        "editorspelling"           => 0,
-       "editorfontlist"           => "Arial:arial,helvetica,sans-serif;Courier New:courier new,courier,monospace;Georgia:georgia,times new roman,times,serif;Tahoma:tahoma,arial,helvetica,sans-serif;Times New Roman:times new roman,times,serif;Verdana:verdana,arial,helvetica,sans-serif;Impact:impact;Wingdings:wingdings",
+       "editorfontlist"           => "Trebuchet:Trebuchet MS,Verdana,Arial,Helvetica,sans-serif;Arial:arial,helvetica,sans-serif;Courier New:courier new,courier,monospace;Georgia:georgia,times new roman,times,serif;Tahoma:tahoma,arial,helvetica,sans-serif;Times New Roman:times new roman,times,serif;Verdana:verdana,arial,helvetica,sans-serif;Impact:impact;Wingdings:wingdings",
        "filteruploadedfiles"      =>  true,
        "forcelogin"               =>  false,
        "forceloginforprofiles"    =>  false,