Skip to content

Commit

Permalink
Added 9pt and 11pt to the list of font sizes in HTML editor
Browse files Browse the repository at this point in the history
  • Loading branch information
alecpl committed Mar 6, 2018
1 parent 264da42 commit eb91daf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ CHANGELOG Roundcube Webmail
- Fix PHP Warning: exif_read_data(...): Illegal IFD size (#6169)
- Enigma: Fix key generation in Safari by upgrade to OpenPGP 2.6.2 (#6149)
- Fix security issue in remote content blocking on HTML image and style tags (#6178)
- Added 9pt and 11pt to the list of font sizes in HTML editor

RELEASE 1.3.4
-------------
Expand Down
1 change: 1 addition & 0 deletions program/js/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function rcube_text_editor(config, id)
statusbar: false,
toolbar_items_size: 'small',
extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
fontsize_formats: '8pt 9pt 10pt 11pt 12pt 14pt 18pt 24pt 36pt',
relative_urls: false,
remove_script_host: false,
convert_urls: false, // #1486944
Expand Down
2 changes: 1 addition & 1 deletion program/steps/settings/func.inc
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ function rcmail_user_prefs($current = null)
$field_id = 'rcmfd_default_font_size';
$select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));

$fontsizes = array('', '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
$fontsizes = array('', '8pt', '9pt', '10pt', '11pt', '12pt', '14pt', '18pt', '24pt', '36pt');
foreach ($fontsizes as $size) {
$select_default_font_size->add($size, $size);
}
Expand Down

0 comments on commit eb91daf

Please sign in to comment.