diff --git a/assets/ckeditor/html_label.js b/assets/ckeditor/html_label.js index 7385043f..d9b56d35 100644 --- a/assets/ckeditor/html_label.js +++ b/assets/ckeditor/html_label.js @@ -188,6 +188,8 @@ Editor.defaultConfig = { 'fontSize': { options: [ 'default', + 6, + 7, 8, 9, 10, @@ -222,7 +224,7 @@ Editor.defaultConfig = { 'tableCellProperties', 'tableProperties' ] - } + }, }; export default { Editor, EditorWatchdog }; diff --git a/assets/controllers/elements/ckeditor_controller.js b/assets/controllers/elements/ckeditor_controller.js index 87607709..2df84f47 100644 --- a/assets/controllers/elements/ckeditor_controller.js +++ b/assets/controllers/elements/ckeditor_controller.js @@ -6,6 +6,7 @@ import { default as HTMLLabelEditor } from "../../ckeditor/html_label"; import EditorWatchdog from '@ckeditor/ckeditor5-watchdog/src/editorwatchdog'; +import "../../css/ckeditor.css"; /* stimulusFetch: 'lazy' */ export default class extends Controller { @@ -43,6 +44,13 @@ export default class extends Controller { editor.enableReadOnlyMode("readonly"); } + //Apply additional styles + const editor_div = editor.ui.view.element; + const new_classes = this.element.dataset.ckClass; + if (editor_div && new_classes) { + editor_div.classList.add(...new_classes.split(",")); + } + console.log(editor); }) .catch(error => { diff --git a/assets/css/ckeditor.css b/assets/css/ckeditor.css new file mode 100644 index 00000000..fbd93b44 --- /dev/null +++ b/assets/css/ckeditor.css @@ -0,0 +1,19 @@ +/******************************************************************** +* HTML Label style override +*********************************************************************/ + +/** Should be the same settings, as in label_style.css */ +.ck-html-label .ck-content { + font-family: "DejaVu Sans Mono", monospace; + font-size: 12px; + line-height: 1.0; + font-size-adjust: 1.5; +} + +.ck-html-label .ck-content p { + margin: 0; +} + +.ck-html-label .ck-content hr { + margin: 2px; +} diff --git a/src/Form/LabelOptionsType.php b/src/Form/LabelOptionsType.php index 781702fa..b5e4d11c 100644 --- a/src/Form/LabelOptionsType.php +++ b/src/Form/LabelOptionsType.php @@ -106,6 +106,7 @@ class LabelOptionsType extends AbstractType 'mode' => 'html-label', 'attr' => [ 'rows' => 4, + 'data-ck-class' => 'ck-html-label' ], ]); diff --git a/templates/LabelSystem/labels/label_page_1d.html.twig b/templates/LabelSystem/labels/label_page_1d.html.twig index ffdc8d5c..1f3767fb 100644 --- a/templates/LabelSystem/labels/label_page_1d.html.twig +++ b/templates/LabelSystem/labels/label_page_1d.html.twig @@ -3,7 +3,7 @@ {{ element.lines | raw }}