Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 6 insertions, 0 deletions

diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index bf7c4df2a..97c8f3b25 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -245,6 +245,8 @@ $config['support_url'] = '';
 
 // replace Roundcube logo with this image
 // specify an URL relative to the document root of this Roundcube installation
+// an array can be used to specify different logos for specific template files, '*' for default logo
+// for example array("*" => "/images/roundcube_logo.png", "messageprint" => "/images/roundcube_logo_print.png")
 $config['skin_logo'] = null;
 
 // automatically create a new Roundcube user when log-in the first time.
@@ -982,5 +984,9 @@ $config['autocomplete_single'] = false;
 // Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
 $config['default_font'] = 'Verdana';
 
+// Default font size for composed HTML message.
+// Supported sizes: 8pt, 10pt, 12pt, 14pt, 18pt, 24pt, 36pt
+$config['default_font_size'] = '10pt';
+
 // Enables display of email address with name instead of a name (and address in title)
 $config['message_show_email'] = false;