diff --git a/resources/lang/fr/models.php b/resources/lang/fr/models.php index d219ee3..85f0428 100644 --- a/resources/lang/fr/models.php +++ b/resources/lang/fr/models.php @@ -17,7 +17,7 @@ return [ 'network' => 'réseau|réseaux', 'aisle' => 'rayon', 'brand' => 'marque', - 'carousel' => 'carrousel|carrousels' + 'carousel' => 'carrousel|carrousels', 'sticky' => 'menu d\'ancre|menu d\'ancres' ] ]; diff --git a/resources/sass/fo/pages/_hire.scss b/resources/sass/fo/pages/_hire.scss index 2230e7c..e36241e 100644 --- a/resources/sass/fo/pages/_hire.scss +++ b/resources/sass/fo/pages/_hire.scss @@ -47,45 +47,4 @@ filter: invert(1); } } - - .we-hire-navigation { - @include media-breakpoint-up(md) { - position: fixed; - z-index: 10; - bottom: 4rem; - left: 4rem; - max-width: 15rem; - - &-wrapper { - height: 0; - opacity: 0; - transform: translateY(25%); - transition: .3s; - visibility: hidden; - - &.show { - height: auto; - opacity: 1; - transform: translateY(0); - visibility: visible; - } - } - } - - .col-md-12 { - @include media-breakpoint-up(md) { - width: fit-content; - } - - .badge { - width: .5rem; - height: .5rem; - - @include media-breakpoint-up(md) { - width: 1rem; - height: 1rem; - } - } - } - } } diff --git a/resources/ts/fo/fo.ts b/resources/ts/fo/fo.ts index 72ab4c7..c1c5da6 100644 --- a/resources/ts/fo/fo.ts +++ b/resources/ts/fo/fo.ts @@ -21,9 +21,5 @@ import "./base/sticky"; // PAGES import "./pages/unveil"; -<<<<<<< HEAD import "./pages/site"; -======= -import "./pages/we-hire"; ->>>>>>> ed349bc (feat: :sparkles: implement CRUD stickies) diff --git a/resources/ts/fo/pages/unveil.ts b/resources/ts/fo/pages/unveil.ts index 4591d02..fa9f8f6 100644 --- a/resources/ts/fo/pages/unveil.ts +++ b/resources/ts/fo/pages/unveil.ts @@ -7,17 +7,6 @@ document.addEventListener("DOMContentLoaded", function () { return; } - const button = document.querySelector(".unveil-navigation .btn") as HTMLButtonElement; - const navWrapper = document.querySelectorAll(".unveil-navigation-wrapper "); - button.addEventListener("click", () => { - navWrapper.forEach((element: Element) => { - element.classList.toggle("show"); - }); - document.querySelectorAll(".unveil-navigation .btn svg").forEach(icon => { - icon.classList.toggle("d-none"); - }); - }); - // The colors to use in the carousel, in this order. const colors = [ "quint", "secondary", "sixt", "quad" diff --git a/resources/ts/fo/pages/we-hire.ts b/resources/ts/fo/pages/we-hire.ts deleted file mode 100644 index bbea9d7..0000000 --- a/resources/ts/fo/pages/we-hire.ts +++ /dev/null @@ -1,17 +0,0 @@ -document.addEventListener("DOMContentLoaded", function () { - const weHire = document.querySelector("section.we-hire"); - if (weHire === null) { - return; - } - - const button = document.querySelector(".we-hire-navigation .btn") as HTMLButtonElement; - const navWrapper = document.querySelectorAll(".we-hire-navigation-wrapper "); - button.addEventListener("click", () => { - navWrapper.forEach((element: Element) => { - element.classList.toggle("show"); - }); - document.querySelectorAll(".we-hire-navigation .btn svg").forEach(icon => { - icon.classList.toggle("d-none"); - }); - }); -}); diff --git a/resources/views/bo/pages/stickies/form.blade.php b/resources/views/bo/pages/stickies/form.blade.php index 6f2d9a1..42d5af4 100644 --- a/resources/views/bo/pages/stickies/form.blade.php +++ b/resources/views/bo/pages/stickies/form.blade.php @@ -53,11 +53,7 @@ {{-- ANCHOR --}} -<<<<<<< HEAD @can('create', \App\Models\Sticky::class) -======= - @can('view', \App\Models\Sticky::class) ->>>>>>> ed349bc (feat: :sparkles: implement CRUD stickies)
{{ Str::ucfirst(__('validation.custom.anchor')) }} diff --git a/resources/views/bo/pages/stickies/index-list.blade.php b/resources/views/bo/pages/stickies/index-list.blade.php index 74a3241..0db8cff 100644 --- a/resources/views/bo/pages/stickies/index-list.blade.php +++ b/resources/views/bo/pages/stickies/index-list.blade.php @@ -11,7 +11,7 @@ @foreach ($stickyModels as $stickyModel) - + {{ $stickyModel->type->label() }} {{ $stickyModel->title }} diff --git a/resources/views/fo/pages/commitments.blade.php b/resources/views/fo/pages/commitments.blade.php index ce2cb54..bcb1eb8 100644 --- a/resources/views/fo/pages/commitments.blade.php +++ b/resources/views/fo/pages/commitments.blade.php @@ -17,38 +17,38 @@ @section('content')
+
+
+ {{-- blade-formatter-disable --}} + @php + $commitNav = [ + ['label' => __('Élever durablement'), 'link' => '#breeding', 'color' => 'tertiary'], + ['label' => __('Mieux vivre'), 'link' => '#life', 'color' => 'quad'], + ['label' => __('Respecter la terre'), 'link' => '#earth', 'color' => 'quint'], + ['label' => __('Bien nourrir'), 'link' => '#feed', 'color' => 'sixt']]; + @endphp + {{-- blade-formatter-enable --}} + @foreach ($commitNav as $key => $value) +
+
+ + + {{ $value['label'] }} + +
+
+ @endforeach +
+ +
{{-- AMBITION --}}
-
-
- {{-- blade-formatter-disable --}} - @php - $commitNav = [ - ['label' => __('Élever durablement'), 'link' => '#breeding', 'color' => 'tertiary'], - ['label' => __('Mieux vivre'), 'link' => '#life', 'color' => 'quad'], - ['label' => __('Respecter la terre'), 'link' => '#earth', 'color' => 'quint'], - ['label' => __('Bien nourrir'), 'link' => '#feed', 'color' => 'sixt']]; - @endphp - {{-- blade-formatter-enable --}} - @foreach ($commitNav as $key => $value) -
-
- - - {{ $value['label'] }} - -
-
- @endforeach -
- -

{{ $ambitionSection->h2_title }}

diff --git a/resources/views/fo/pages/hire.blade.php b/resources/views/fo/pages/hire.blade.php index 5606669..a23853d 100644 --- a/resources/views/fo/pages/hire.blade.php +++ b/resources/views/fo/pages/hire.blade.php @@ -17,49 +17,49 @@ @section('content')
+
+
+ @foreach ($navLinks as $key => $link) +
+
index) { + 0 => 'bg-primary-light', + 1 => 'bg-secondary-light', + 2 => 'bg-quad-light', + 3 => 'bg-quint-light', + 4 => 'bg-sixt-light', + default => 'bg-primary-light' + } + ])> + + index) { + 0 => 'bg-primary', + 1 => 'bg-secondary', + 2 => 'bg-quad', + 3 => 'bg-quint', + 4 => 'bg-sixt', + default => 'bg-primary' + } + ])> + {{ $link->title }} + +
+
+ @endforeach +
+ +
{{-- COMPAGNY LIFE --}}
-
-
- @foreach ($navLinks as $key => $link) -
-
index) { - 0 => 'bg-primary-light', - 1 => 'bg-secondary-light', - 2 => 'bg-quad-light', - 3 => 'bg-quint-light', - 4 => 'bg-sixt-light', - default => 'bg-primary-light' - } - ])> - - index) { - 0 => 'bg-primary', - 1 => 'bg-secondary', - 2 => 'bg-quad', - 3 => 'bg-quint', - 4 => 'bg-sixt', - default => 'bg-primary' - } - ])> - {{ $link->title }} - -
-
- @endforeach -
- -
diff --git a/resources/views/fo/pages/unveil.blade.php b/resources/views/fo/pages/unveil.blade.php index d322276..bba27b7 100644 --- a/resources/views/fo/pages/unveil.blade.php +++ b/resources/views/fo/pages/unveil.blade.php @@ -17,49 +17,49 @@ @section('content')
+
+
+ @foreach ($navLinks as $key => $link) +
+
index) { + 0 => 'bg-primary-light', + 1 => 'bg-secondary-light', + 2 => 'bg-quad-light', + 3 => 'bg-quint-light', + 4 => 'bg-sixt-light', + default => 'bg-primary-light' + } + ])> + + index) { + 0 => 'bg-primary', + 1 => 'bg-secondary', + 2 => 'bg-quad', + 3 => 'bg-quint', + 4 => 'bg-sixt', + default => 'bg-primary' + } + ])> + {{ $link->title }} + +
+
+ @endforeach +
+ +
{{-- KEY NUMBERS --}}
-
-
- @foreach ($navLinks as $key => $link) -
-
index) { - 0 => 'bg-primary-light', - 1 => 'bg-secondary-light', - 2 => 'bg-quad-light', - 3 => 'bg-quint-light', - 4 => 'bg-sixt-light', - default => 'bg-primary-light' - } - ])> - - index) { - 0 => 'bg-primary', - 1 => 'bg-secondary', - 2 => 'bg-quad', - 3 => 'bg-quint', - 4 => 'bg-sixt', - default => 'bg-primary' - } - ])> - {{ $link->title }} - -
-
- @endforeach -
- -