Commit 20a8246a authored by Maxime Chaillet's avatar Maxime Chaillet

Fix indentation for bullet/ordered lists sitting aside of a floating image. It...

Fix indentation for bullet/ordered lists sitting aside of a floating image. It fixes #55.
parent e2618f53
/* stylesheet which overrides default browser css styles. CSS below are used in tinyMCE only. */
ul, ol {
display: inline-block;
}
\ No newline at end of file
...@@ -100,7 +100,8 @@ class HTMLEditor extends Component { ...@@ -100,7 +100,8 @@ class HTMLEditor extends Component {
paste_data_images: config.paste_data_images, paste_data_images: config.paste_data_images,
autoresize_min_height: config.autoresize_min_height, autoresize_min_height: config.autoresize_min_height,
autoresize_max_height: config.autoresize_max_height, autoresize_max_height: config.autoresize_max_height,
formats: config.formats formats: config.formats,
content_css:config.content_css
}} }}
value={editorContent} value={editorContent}
onEditorChange={this.onEditorChange} onEditorChange={this.onEditorChange}
......
...@@ -16,16 +16,19 @@ import 'tinymce/plugins/autoresize'; ...@@ -16,16 +16,19 @@ import 'tinymce/plugins/autoresize';
/** the general configuration set used for all instances of the editor */ /** the general configuration set used for all instances of the editor */
class GeneralConfig { class GeneralConfig {
constructor(userView) { constructor(userView) {
this.plugins = 'link, image, textcolor, fullscreen, media, paste, table, lists, autoresize'; this.plugins = 'link, image, textcolor, fullscreen, media, paste, table, lists, autoresize, importcss';
this.skin_url = '/skins/customLightgray'; this.skin_url = '/tinymce/skins/customLightgray';
this.statusbar = false; this.statusbar = false;
this.branding = false; // hides powered by tinymce this.branding = false; // hides powered by tinymce
this.paste_data_images = true; this.paste_data_images = true;
this.autoresize_min_height = 400; //in px this.autoresize_min_height = 400; //in px
this.autoresize_max_height = 800; //in px this.autoresize_max_height = 800; //in px
this.content_css = '/tinymce/customStyles.css';
this.formats = { this.formats = {
alignleft: { selector: 'img', styles: { float: 'left', margin: '10px' } }, alignleft: { selector: 'img', styles: { float: 'left', margin: '10px' } },
alignright: { selector: 'img', styles: { float: 'right', margin: '10px' } }, alignright: { selector: 'img', styles: { float: 'right', margin: '10px' } },
bullist:{ selector: 'ul', styles: { display: 'inline-block' } },
} }
} }
} }
......
...@@ -4,6 +4,10 @@ body { ...@@ -4,6 +4,10 @@ body {
font-family: sans-serif; font-family: sans-serif;
} }
ul, ol {
display: inline-block;
}
.noBorder { .noBorder {
border-style: none; border-style: none;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment