Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Jérémy Munsch
fe6227069d
Fix fucking boostrap wrong theming 2023-08-11 13:13:06 +02:00
Jérémy Munsch
f721c5145d
Fix recipe list style 2023-08-11 13:13:06 +02:00
Jérémy Munsch
1e0c48613b
Add missing reset style on ck-content class 2023-08-11 13:13:05 +02:00
Alexis Gousseau
8d69f313f5
fix ckeditor class - issue #159 2023-08-11 13:13:05 +02:00
12 changed files with 43 additions and 19 deletions

View file

@ -17,19 +17,21 @@
.ing-wrapper { width: 312px; }
.ing-wrapper ul { list-style-type: circle; }
.recipe-steps ol {
.recipe-steps ol,
.recipe-steps ul {
margin-top: 1.7rem;
counter-reset: step;
// * Custom list style counter implementation
ul,
ol {
list-style-type: none !important;
}
list-style-type: none !important;
li {
position: relative;
margin-bottom: 1.7rem;
marker: none;
ol,
ul {
margin-top: 1.7rem;
}
}
li::before {

View file

@ -92,3 +92,5 @@ $pagination-disabled-border-color: transparent;
// CUSTOM BREADCRUMB
$breadcrumb-divider-color: $white;
$breadcrumb-active-color: $white;
$body-bg: $color-bg-body;
$body-color: $text-color;

View file

@ -7,12 +7,12 @@
@import "~bootstrap/scss/variables";
// Override bootstrap variables
@import "fo/utilities/variables";
@import "fo/utilities/bs-variables";
@import "bootstrap";
// Override bootstrap
@import "fo/utilities/functions";
@import "fo/utilities/variables";
@import "fo/utilities/bs-custom";
@import "fo/utilities/mixins";
@import "components/buttons";

View file

@ -1,3 +1,23 @@
// CKeditor fix in alert
.ck-editor__main {
color: initial;
}
// Boutique FIX
.ck-content {
// * Import bootstrap reboot to counter count theme aggressive reset
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins";
$theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value");
@import "~bootstrap/scss/root";
@import "~bootstrap/scss/reboot";
// ! Force word break a cause de ces pleurnicheurs de clients et tests non pertinents.
overflow-wrap: break-word;
}
/*
* CKEditor 5 (v35.4.0) content styles.
* Generated on Tue, 10 Jan 2023 09:23:34 GMT.

View file

@ -35,7 +35,7 @@
</div>
<div class="col-12 col-md-6 d-flex flex-column justify-content-center align-items-center txt-col text-center text-md-start px-md-0 pe-md-4 pe-lg-6 pe-xl-8">
<div>
<p>{!! clean($activity_text) !!}</p>
<p class="ck-content">{!! clean($activity_text) !!}</p>
</div>
</div>
</div>

View file

@ -23,7 +23,7 @@
</div>
<div class="slide-txt d-flex flex-column justify-content-center position-relative position-md-static text-center text-md-start py-6 px-5 py-sm-5 p-xl-5 w-100 w-md-35">
<p class="h1 mb-5">{{ $slide->title }}</p>
<div class="mb-4 ck-content">{!! clean($slide->content) !!}</div>
<div class="ck-content mb-4">{!! clean($slide->content) !!}</div>
@if($slide->button_display)
<div class="butn-wrap d-flex justify-content-center justify-content-md-start text-center my-4 w-100 w-lg-auto">
<a class="butn-prim mx-0" href="{{ $slide->button_url }}" @if($slide->button_targetblank) target="_blank" @endif>{{ $slide->button_text }}</a>

View file

@ -133,7 +133,7 @@
class="col-12 col-md-6 d-flex justify-content-center pb-5"
data-json='@json($dataVue)'></div>
@endif
<div class="recipe-steps col-12 col-md-6 px-5 px-md-0 pe-md-3">
<div class="ck-content recipe-steps col-12 col-md-6 px-5 px-md-0 pe-md-3">
<h2 class="h2 color-second my-4">{{ __('Progression de la recette') }}</h2>
{!! clean($recipe->preparation) !!}
@if($recipe->advice)

View file

@ -67,7 +67,7 @@
</div>
</div>
</div>
<div class="col-12 col-md-6 d-flex flex-column justify-content-center align-items-center txt-col text-center text-md-start px-md-0 pe-md-4 pe-lg-6 pe-xl-8">
<div class="ck-content col-12 col-md-6 d-flex flex-column justify-content-center align-items-center txt-col text-center text-md-start px-md-0 pe-md-4 pe-lg-6 pe-xl-8">
{!! clean($news->content) !!}
</div>
</div>
@ -126,7 +126,7 @@
</div>
</div>
<div class="col-12 col-md-6 d-flex flex-column justify-content-center align-items-center order-md-1 txt-col px-md-0">
<div class="text-center text-md-start ps-md-4 ps-lg-6 ps-xl-8">
<div class="ck-content text-center text-md-start ps-md-4 ps-lg-6 ps-xl-8">
{!! clean($news->content2) !!}
</div>
</div>

View file

@ -13,7 +13,7 @@
@endforeach
</div>
<div class="card-txt d-flex flex-column justify-content-between align-items-center flex-grow-1">
<div class="card-subtitle ff-poppins-regular my-0 mx-4">{!! clean($news_item->content) !!}</div>
<div class="ck-content card-subtitle ff-poppins-regular my-0 mx-4">{!! clean($news_item->content) !!}</div>
<div class="butn-wrap mt-4">
<a href="{{ route('news.show', ['actu' => $news_item->slug]) }}" class="butn-sec bg-transparent m-0">{{ __('À lire') }}</a>
</div>

View file

@ -66,9 +66,9 @@
<p class="my-3">{{ __('Marque : ') }}<b>{{ __('LE GAULOIS PROFESSIONNEL') }}</b></p>
<p class="my-3">{{ __('Origine de la viande : ') }}<b>{{ ($product->is_frenchpoultry) ? 'France' : 'Étrangère'; }}</b></p>
<p class="mb-0"><b>{{ __('Conseils de préparation :') }}</b></p>
<p class="mt-0 mb-3">{!! clean($product->preparation) !!}</p>
<p class="ck-content mt-0 mb-3">{!! clean($product->preparation) !!}</p>
<p class="poppins-bold fs-md border-bottom border-2 w-fit pb-1 mt-5 mb-4">{{ __('Les atouts produit :') }}</p>
<p class="my-3 mt-4">{!! clean($product->advantage) !!}</p>
<p class="ck-content my-3 mt-4">{!! clean($product->advantage) !!}</p>
<p class="poppins-bold fs-md border-bottom border-2 w-fit pb-1 mt-5 mb-4">{{ __('Valeurs nutritionnelles moyennes pour 100g :') }}</p>
<table class="w-100">
<tbody>
@ -212,7 +212,7 @@
</div>
<div class="row order-lg-3 prod-ing-wrapper px-3 px-lg-0 me-lg-auto pb-5">
<div class="prod-txt text-center text-lg-start">
<div class="ck-content prod-txt text-center text-lg-start">
<p class="ff-poppins-medium fs-lg">{{ __('Ingrédients :') }}</p>
{!! clean($product->ingredients) !!}
<p class="ff-poppins-medium fs-lg mt-4">{{ __('Les atouts produit :') }}</p>

View file

@ -643,7 +643,7 @@
@endforeach
</div>
<div class="card-txt d-flex flex-column justify-content-between align-items-center flex-grow-1">
<div class="card-subtitle ff-poppins-regular my-0 mx-4">{!! clean($news_item->content) !!}</div>
<div class="ck-content card-subtitle ff-poppins-regular my-0 mx-4">{!! clean($news_item->content) !!}</div>
<div class="butn-wrap mt-4">
<a href="{{ route('news.show', ['actu' => $news_item->slug]) }}" class="butn-sec bg-transparent m-0">{{ __('À lire') }}</a>
</div>

View file

@ -1,7 +1,7 @@
<div class="col d-flex flex-column text-center pb-6 px-lg-0">
<h1 class="h1 mb-4">{{ $title ?? '' }}</h1>
{{-- Autoriser les balises, foutu print --}}
<p class="text-header paragraph-format d-none d-md-block mx-auto">{!! clean($description) !!}</p>
<p class="ck-content text-header paragraph-format d-none d-md-block mx-auto">{!! clean($description) !!}</p>
</div>
<div class="separator-header position-absolute bottom-0 start-0 px-0 w-100">
<img class="w-100" src="{{ asset('build/assets/images/banner/banner-header-desktop.png') }}" alt="">