From a952ea6ac62e6a45baaa5caec43b6677e267c4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 22 Dec 2023 11:44:57 +0100 Subject: [PATCH] Fixes #48 Add style to ck-content + fix all front WYSIWYG taht where missing ck-content --- resources/sass/fo/fo.scss | 2 +- resources/sass/fo/vendor/_ckEditorContent.scss | 14 ++++++++++++++ resources/views/fo/pages/home.blade.php | 8 ++++++-- resources/views/fo/pages/news/show.blade.php | 4 +++- .../views/fo/pages/products/show.blade.php | 18 +++++++++++++++--- resources/views/fo/pages/ranges/show.blade.php | 4 +++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/resources/sass/fo/fo.scss b/resources/sass/fo/fo.scss index 05df477..327f7b8 100644 --- a/resources/sass/fo/fo.scss +++ b/resources/sass/fo/fo.scss @@ -4,8 +4,8 @@ @import './utilities/variables'; // * VENDOR -@import './vendor/ckEditorContent'; @import './vendor/bootstrap'; +@import './vendor/ckEditorContent'; @import "./vendor/cookie-notice"; @import "./vendor/swiper"; diff --git a/resources/sass/fo/vendor/_ckEditorContent.scss b/resources/sass/fo/vendor/_ckEditorContent.scss index 1b9bc53..747f52e 100644 --- a/resources/sass/fo/vendor/_ckEditorContent.scss +++ b/resources/sass/fo/vendor/_ckEditorContent.scss @@ -13,6 +13,20 @@ @import "bootstrap/scss/mixins"; @import "bootstrap/scss/root"; @import "bootstrap/scss/reboot"; + + + // * CK CONTENT overload pour créa + h2 { + width: fit-content; + padding: 0.2rem 1.5rem; + margin-top: 0.5rem; + color: $body-bg; + font-family: 'Readex Pro', sans-serif !important; + hyphens: auto; + overflow-wrap: break-word; + + @include input-shape($body-color); + } } /* diff --git a/resources/views/fo/pages/home.blade.php b/resources/views/fo/pages/home.blade.php index bfc474e..e28bf85 100644 --- a/resources/views/fo/pages/home.blade.php +++ b/resources/views/fo/pages/home.blade.php @@ -36,7 +36,9 @@ {{ __('au fil de l\'année') }} {{ $seasonalSectionsModel->title }} - {!! clean($seasonalSectionsModel->text) !!} +
+ {!! clean($seasonalSectionsModel->text) !!} +
@@ -61,7 +63,9 @@
- {!! clean($homepageModel->presentation_content) !!} +
+ {!! clean($homepageModel->presentation_content) !!} +
{{ __('> En savoir +') }}
diff --git a/resources/views/fo/pages/news/show.blade.php b/resources/views/fo/pages/news/show.blade.php index 08a44a2..99b2e9a 100644 --- a/resources/views/fo/pages/news/show.blade.php +++ b/resources/views/fo/pages/news/show.blade.php @@ -34,7 +34,9 @@

{{ $newsModel->subtitle }}


- {!! clean($newsModel->content) !!} +
+ {!! clean($newsModel->content) !!} +
diff --git a/resources/views/fo/pages/products/show.blade.php b/resources/views/fo/pages/products/show.blade.php index 59d7934..7cfe1cf 100644 --- a/resources/views/fo/pages/products/show.blade.php +++ b/resources/views/fo/pages/products/show.blade.php @@ -57,7 +57,11 @@
{{-- DESCRIPTION --}} -
{!! clean($productModel->description) !!}
+
+
+ {!! clean($productModel->description) !!} +
+
{{-- PICTOS --}} @if (!empty($productModel->commitments)) @@ -89,14 +93,22 @@
{{ $productModel->cooking_mode->alt() }} -
{!! clean($productModel->cooking_advice) !!}
+
+
+ {!! clean($productModel->cooking_advice) !!} +
+
{{-- INGREDIENTS --}}

{{ __('Ingrédients') }}

-
{!! clean($productModel->ingredients) !!}
+
+
+ {!! clean($productModel->ingredients) !!} +
+
diff --git a/resources/views/fo/pages/ranges/show.blade.php b/resources/views/fo/pages/ranges/show.blade.php index 51eae47..cc39a31 100644 --- a/resources/views/fo/pages/ranges/show.blade.php +++ b/resources/views/fo/pages/ranges/show.blade.php @@ -23,7 +23,9 @@

{{ Str::of($rangeModel->tagline)->ucFirst() }}

- {!! clean($rangeModel->description) !!} +
+ {!! clean($rangeModel->description) !!} +