From: Jérémy Fabre Date: Thu, 22 Sep 2016 13:36:44 +0000 (+0200) Subject: Add the highlighted paragraph style to TinyMCE X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=56a5f31f7dd3eccb0482edef33832c6885259085;p=mezzo.git Add the highlighted paragraph style to TinyMCE --- diff --git a/app/organization/core/static/js/tinymce_setup.js b/app/organization/core/static/js/tinymce_setup.js index d9f2a70e..a2e8adf6 100644 --- a/app/organization/core/static/js/tinymce_setup.js +++ b/app/organization/core/static/js/tinymce_setup.js @@ -78,7 +78,10 @@ jQuery(function($) { { title: 'Boutons Blanc', selector: 'a', classes: 'wys-button-white'}, { title: 'Boutons Blanc Small', selector: 'a', classes: 'wys-button-white-small'}, { title: 'Boutons Blanc XSmall', selector: 'a', classes: 'wys-button-white-xsmall'} - ] + ], + title: 'Paragraphs', items: [ + { title: 'Highlighted paragraph', selector: 'p', classes: 'wys-highlighted-paragraph'} + ] } ], style_formats_merge: true diff --git a/app/static/src/sass/global/_wysiwyg.scss b/app/static/src/sass/global/_wysiwyg.scss index 3278825d..4e43fc06 100644 --- a/app/static/src/sass/global/_wysiwyg.scss +++ b/app/static/src/sass/global/_wysiwyg.scss @@ -141,3 +141,18 @@ @include margin(1); } + +.wys-highlighted-paragraph { + + @include padding-left(1); + @include margin-top(1.5); + border-left: 1px solid $color-black; + + & + .wys-highlighted-paragraph { + + @include margin-top(-1); + @include padding-top(1); + + } + +}