Skip to content

Commit

Permalink
Allow to define multiple tinymce-content-css in theme ``manifest.…
Browse files Browse the repository at this point in the history
…cfg`` files, seperated by a comma. Like above. (#1598)
  • Loading branch information
thet authored and jensens committed May 31, 2016
1 parent e851a9a commit 020f704
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ New:

- Add link to training.plone.org
[svx]
- Allow to define multiple ``tinymce-content-css`` in theme ``manifest.cfg`` files, seperated by a comma.
[thet]

- Update npm package depencies.
[thet]
Expand Down
5 changes: 4 additions & 1 deletion Products/CMFPlone/patterns/tinymce.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ def get_content_css(self, style_css=''):
theme = self.get_theme()
tinymce_content_css = getattr(theme, 'tinymce_content_css', None)
if tinymce_content_css is not None:
files.append(self.nav_root_url + theme.tinymce_content_css)
files.extend([
self.nav_root_url + _
for _ in theme.tinymce_content_css.split(',')
])

return ','.join(files)

Expand Down

0 comments on commit 020f704

Please sign in to comment.