forge-joniko/ldc-legaulois
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Noah Lancien 2024-12-05 09:18:09 +01:00
commit cc2712d81a
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/sass/fo/pages/story.scss
View file

@ -102,7 +102,7 @@
transform: translateY(-8rem);
}
@include media-breakpoint-up(lg) {
@include media-breakpoint-up(xl) {
&::before {
display: none;
}
@ -134,7 +134,7 @@
}
}
.col-10>div::before {
.col-10 > div::before {
position: absolute;
top: calc(50% - 2rem);
left: 50%;

5
resources/ts/fo/partials/historical-milestones.ts
View file

@ -18,8 +18,6 @@ document.addEventListener("DOMContentLoaded", function () {
const swiperYearsNode = document.querySelector("#swiper-historicalmilestone-years") as unknown as SwiperType;
const swiperYearsBtns = document.querySelectorAll("#swiper-historicalmilestone-years .btn") as NodeListOf<HTMLButtonElement>;
let isChangingSlide = false; // Flag to avoid conflict between onClick and onScroll actions on mobile.
// MOBILE on click navigation (arrows)
setTimeout(() => {
@ -30,7 +28,6 @@ document.addEventListener("DOMContentLoaded", function () {
const slides = swiperYearsNode.swiper.slides;
const activeSlide = slides[activeIndex];
const linkElement = activeSlide.querySelector("a");
console.log(linkElement);
if (linkElement && linkElement.href) {
// Simule un clic sur le lien
linkElement.click();
@ -70,8 +67,6 @@ document.addEventListener("DOMContentLoaded", function () {
}
});
// DESKTOP.
setTimeout(() => {
const swiperNodeDesktop = document.querySelector("#swiper-historicalmilestone-desktop") as unknown as SwiperType;

4
resources/views/fo/pages/story.blade.php
View file

@ -196,7 +196,7 @@
</div>
<div class="col-7">
<div @class([
'bottom-left-shadow w-fit',
'slider-videos bottom-left-shadow w-100',
$loop->iteration % 2 ? 'rotate-right' : 'rotate-left',
])>
@if (isset($historicalMilestoneModel->picto) && $historicalMilestoneModel->picto !== null)
@ -213,7 +213,7 @@
(isset($historicalMilestoneModel->picture) && $historicalMilestoneModel->picture !== null) ||
(isset($historicalMilestoneModel->video_id) && $historicalMilestoneModel->video_id !== null))
<div @class([
'slider-videos line-border-small bg-white p-2',
'line-border-small bg-white p-2',
'w-fit' =>
isset($historicalMilestoneModel->picture) &&
$historicalMilestoneModel->picture !== null,