diff --git a/public/assets/images/cuit.jpg b/public/assets/images/cuit.jpg deleted file mode 100644 index b85cfc1..0000000 Binary files a/public/assets/images/cuit.jpg and /dev/null differ diff --git a/public/assets/images/entete_gammes.jpg b/public/assets/images/entete_gammes.jpg new file mode 100644 index 0000000..97d6bac Binary files /dev/null and b/public/assets/images/entete_gammes.jpg differ diff --git a/public/assets/images/entete_sous_gammes.jpg b/public/assets/images/entete_sous_gammes.jpg new file mode 100644 index 0000000..edcbcaa Binary files /dev/null and b/public/assets/images/entete_sous_gammes.jpg differ diff --git a/public/css/app.css b/public/css/app.css index c1d22c3..f872cb3 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -4132,15 +4132,26 @@ img{ max-width:max-content; } -.frise-autoscroll{ +#frise-autoscroll{ position:absolute; width:100%; - height:0; - text-align:center; -} -.frise-autoscroll img{ height:100%; } +#frise-autoscroll .img-frise{ + position:relative; + width:-webkit-max-content; + width:-moz-max-content; + width:max-content; + margin:0 auto; +} +#frise-autoscroll .img-frise .svg-mask{ + position:-webkit-sticky; + position:sticky; + width:100%; + height:100px; + bottom:0; + background-image:linear-gradient(to top, #ffffff, #ffffff, #ffffff, transparent); +} #backtotop{ display:none; @@ -4309,6 +4320,10 @@ ul.infos span{ text-align:left; } +.align-justify{ + text-align:justify; +} + .bold{ font-weight:bold; } @@ -4453,13 +4468,6 @@ h1:not(.maintitle){ bottom:0; } -.cuisto:before{ - content:url(/assets/images/cuisto.jpg?4f579fbbef75bdf50eba45e8bdca1f38); - position:absolute; - left:-350px; - top:-50px; -} - .h2{ margin-bottom:0; font-family:"barlow-regular", arial, sans-serif; @@ -5269,9 +5277,6 @@ input[type=text]{ width:360px; margin-bottom:50px; } -.post-card p{ - text-align:justify; -} @media (min-width: 769px){ .product-card{ @@ -5702,7 +5707,7 @@ input[type=text]{ .timeline{ position:relative; max-width:1200px; - margin:0 auto; + margin:4rem auto 0; } .timeline .year{ display:inline-block; @@ -5721,15 +5726,15 @@ input[type=text]{ .timeline .step.is-flex .year{ margin-right:20px; } -.timeline .step:last-child{ - padding-bottom:150px; -} .timeline .step.special > img{ display:block; width:60%; margin-bottom:20px; margin-left:30%; } +.timeline .step .step_content{ + background-color:#fff; +} .timeline .step .step_title{ margin-bottom:10px; } @@ -5739,6 +5744,9 @@ input[type=text]{ .timeline .step .step_title:nth-child(even){ color:#222f5c; } +.timeline .step:not(:last-child){ + margin-bottom:2rem; +} .timeline .step:nth-child(odd) .step_title{ color:#ff0400; } @@ -5756,7 +5764,7 @@ input[type=text]{ .timeline{ z-index:0; } - .timeline .frise-autoscroll{ + .timeline #frise-autoscroll{ top:3rem; } .timeline .step{ @@ -5773,6 +5781,9 @@ input[type=text]{ } } @media screen and (max-width: 799px){ + .timeline #frise-autoscroll{ + display:none; + } .timeline .step{ width:100%; } @@ -5911,6 +5922,16 @@ input[type=text]{ font-size:calc(18px * 4); } +.video-wrapper{ + display:none; +} + +.cuisto{ + position:absolute; + left:0; + top:0; +} + .plan, .phone{ padding-left:80px; diff --git a/public/js/app.js b/public/js/app.js index 8cc755d..aae02e7 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -15,6 +15,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_1__); +// let isPass = false; +// let heightOfsset = 0; +// let heightElt = 0; var app = { init: function init() { window.onscroll = function () { @@ -47,22 +50,41 @@ var app = { for (index = 0; index < imgZoom.length; index++) { imgZoom[index].classList.remove('zoomed'); } - } + } // if (isFriseHover) { + // if (!isPass) { + // heightOfsset = window.scrollY; + // heightElt = document.querySelector(".timeline").clientHeight; + // console.log("heightElt=" + heightElt); + // } + // // let wrapper = document.querySelector(".timeline"); + // // var svgFrise = document.getElementById("frise-svg"); + // // if (svgFrise === null) return; + // // var point1 = document.getElementById("point1"), + // // point2 = document.getElementById("point2"); + // // $doc = $(document); + // // console.log("wrapper.scrollTop=" + wrapper.scrollTop); + // let currentHeight = (window.scrollY - heightOfsset) * 100 / heightElt; + // console.log("currentHeight=" + currentHeight); + // // var scrPos = wrapper.scrollTop / 13; + // point1.setAttribute("offset", currentHeight - 15 + '%') + // point2.setAttribute("offset", currentHeight - 10 + '%') + // // let height = "height:" + currentHeight + "px"; + // // document.getElementById("frise-autoscroll").setAttribute("style", height); + // // console.log(window.scrollY + ":" + height); + // isPass = true; + // } else { + // console.log("fin"); + // } - if (isFriseHover) { - console.log(window.scrollY); - } else { - console.log("fin"); - } } }; document.addEventListener("DOMContentLoaded", app.init); // FONCTION PERMETTANT DE FAIRE UN EFFET ANIMATION AU DEFILEMENT -var isFriseHover = false; var ratio = 0.1; // 10% du div revelé pour rendre visible var options = { root: null, + // Zone d'affichage : null = le viewport rootMargin: "0px", threshold: ratio }; @@ -90,30 +112,26 @@ var handleIntersect = function handleIntersect(entries, observer) { var observer = new IntersectionObserver(handleIntersect, options); document.querySelectorAll(".animate__animated").forEach(function (r) { observer.observe(r); -}); -/** - * - * @param {IntersectionObserverEntry[]} entries - * @param {IntersectionObserver} observer - */ - -var handleFrise = function handleFrise(entries, observer) { - entries.forEach(function (entry) { - // console.log(entry.intersectionRatio); - if (entry.intersectionRatio > ratio) { - if (entry.intersectionRatio > 1) { - isFriseHover = false; - observer.unobserve(entry.target); - console.log("unobserve"); - } else { - isFriseHover = true; - } - } - }); -}; - -var observerFrise = new IntersectionObserver(handleFrise, options); -observerFrise.observe(document.querySelector(".timeline")); +}); // let isFriseHover = false; +// const optionsFrise = { +// root: null, // Zone d'affichage : null = le viewport +// rootMargin: "0px", +// threshold: 0, +// }; +// /** +// * +// * @param {IntersectionObserverEntry[]} entries +// * @param {IntersectionObserver} observer +// */ +// const handleFrise = function (entries, observer) { +// entries.forEach(function (entry) { +// isFriseHover = entry.isIntersecting; +// }); +// }; +// const observerFrise = new IntersectionObserver(handleFrise, optionsFrise); +// document.querySelectorAll(".timeline").forEach(function (r) { +// observerFrise.observe(r); +// }); /***/ }), diff --git a/resources/assets/images/cuit.jpg b/resources/assets/images/cuit.jpg deleted file mode 100644 index b85cfc1..0000000 Binary files a/resources/assets/images/cuit.jpg and /dev/null differ diff --git a/resources/assets/images/entete_gammes.jpg b/resources/assets/images/entete_gammes.jpg new file mode 100644 index 0000000..97d6bac Binary files /dev/null and b/resources/assets/images/entete_gammes.jpg differ diff --git a/resources/assets/images/entete_sous_gammes.jpg b/resources/assets/images/entete_sous_gammes.jpg new file mode 100644 index 0000000..edcbcaa Binary files /dev/null and b/resources/assets/images/entete_sous_gammes.jpg differ diff --git a/resources/js/app.js b/resources/js/app.js index 9cc99f0..bd69e26 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,3 +1,7 @@ +// let isPass = false; +// let heightOfsset = 0; +// let heightElt = 0; + var app = { init: () => { window.onscroll = function () { @@ -36,21 +40,49 @@ var app = { imgZoom[index].classList.remove('zoomed'); } } - if (isFriseHover) { - console.log(window.scrollY); - } else { - console.log("fin"); - } + + + // if (isFriseHover) { + // if (!isPass) { + // heightOfsset = window.scrollY; + // heightElt = document.querySelector(".timeline").clientHeight; + // console.log("heightElt=" + heightElt); + // } + + // // let wrapper = document.querySelector(".timeline"); + // // var svgFrise = document.getElementById("frise-svg"); + + // // if (svgFrise === null) return; + // // var point1 = document.getElementById("point1"), + // // point2 = document.getElementById("point2"); + // // $doc = $(document); + + // // console.log("wrapper.scrollTop=" + wrapper.scrollTop); + + // let currentHeight = (window.scrollY - heightOfsset) * 100 / heightElt; + // console.log("currentHeight=" + currentHeight); + + // // var scrPos = wrapper.scrollTop / 13; + // point1.setAttribute("offset", currentHeight - 15 + '%') + // point2.setAttribute("offset", currentHeight - 10 + '%') + + + // // let height = "height:" + currentHeight + "px"; + // // document.getElementById("frise-autoscroll").setAttribute("style", height); + // // console.log(window.scrollY + ":" + height); + // isPass = true; + // } else { + // console.log("fin"); + // } }, }; document.addEventListener("DOMContentLoaded", app.init); // FONCTION PERMETTANT DE FAIRE UN EFFET ANIMATION AU DEFILEMENT -let isFriseHover = false; const ratio = 0.1; // 10% du div revelé pour rendre visible const options = { - root: null, + root: null, // Zone d'affichage : null = le viewport rootMargin: "0px", threshold: ratio, }; @@ -176,25 +208,23 @@ document.querySelectorAll(".animate__animated").forEach(function (r) { observer.observe(r); }); - -/** - * - * @param {IntersectionObserverEntry[]} entries - * @param {IntersectionObserver} observer - */ -const handleFrise = function (entries, observer) { - entries.forEach(function (entry) { - // console.log(entry.intersectionRatio); - if (entry.intersectionRatio > ratio) { - if (entry.intersectionRatio > 1) { - isFriseHover = false; - observer.unobserve(entry.target); - console.log("unobserve"); - } else { - isFriseHover = true; - } - } - }); -}; -const observerFrise = new IntersectionObserver(handleFrise, options); -observerFrise.observe(document.querySelector(".timeline")); +// let isFriseHover = false; +// const optionsFrise = { +// root: null, // Zone d'affichage : null = le viewport +// rootMargin: "0px", +// threshold: 0, +// }; +// /** +// * +// * @param {IntersectionObserverEntry[]} entries +// * @param {IntersectionObserver} observer +// */ +// const handleFrise = function (entries, observer) { +// entries.forEach(function (entry) { +// isFriseHover = entry.isIntersecting; +// }); +// }; +// const observerFrise = new IntersectionObserver(handleFrise, optionsFrise); +// document.querySelectorAll(".timeline").forEach(function (r) { +// observerFrise.observe(r); +// }); diff --git a/resources/sass/_custom.scss b/resources/sass/_custom.scss index 1f7a136..dd8d0c0 100644 --- a/resources/sass/_custom.scss +++ b/resources/sass/_custom.scss @@ -131,6 +131,16 @@ } } +.video-wrapper { + display: none; +} + +.cuisto { + position: absolute; + left: 0; + top: 0; +} + .plan, .phone { padding-left: 80px; diff --git a/resources/sass/_globals.scss b/resources/sass/_globals.scss index 8d9b90a..570fcab 100644 --- a/resources/sass/_globals.scss +++ b/resources/sass/_globals.scss @@ -19,14 +19,29 @@ img { max-width: max-content; } -.frise-autoscroll { +#frise-autoscroll { position: absolute; width: 100%; - height: 0; - text-align: center; + height: 100%; - img { - height: 100%; + .img-frise { + position: relative; + width: max-content; + margin: 0 auto; + + .svg-mask { + position: sticky; + width: 100%; + height: 100px; + bottom: 0; + background-image: linear-gradient( + to top, + #ffffff, + #ffffff, + #ffffff, + transparent + ); + } } } diff --git a/resources/sass/_list.scss b/resources/sass/_list.scss index 830cd97..e9fe1f0 100644 --- a/resources/sass/_list.scss +++ b/resources/sass/_list.scss @@ -26,7 +26,6 @@ transition: bottom 0.4s; } } - .product-card { .product-card__title, a { @@ -248,10 +247,6 @@ .post-card { width: 360px; margin-bottom: 50px; - - p { - text-align: justify; - } } @media (min-width: 769px) { diff --git a/resources/sass/_texts.scss b/resources/sass/_texts.scss index c0ee8c8..346ac9a 100644 --- a/resources/sass/_texts.scss +++ b/resources/sass/_texts.scss @@ -57,13 +57,6 @@ h1:not(.maintitle) { bottom: 0; } -.cuisto:before { - content: url(~@/images/cuisto.jpg); - position: absolute; - left: -350px; - top: -50px; -} - .h2 { margin-bottom: 0; font-family: $fontbarlow-regular; diff --git a/resources/sass/_timeline.scss b/resources/sass/_timeline.scss index e47f80e..861f80b 100644 --- a/resources/sass/_timeline.scss +++ b/resources/sass/_timeline.scss @@ -1,7 +1,7 @@ .timeline { position: relative; max-width: 1200px; - margin: 0 auto; + margin: 4rem auto 0; .year { display: inline-block; padding: 15px 30px; @@ -21,9 +21,9 @@ margin-right: 20px; } - &:last-child { - padding-bottom: 150px; - } + // &:last-child { + // padding-bottom: 150px; + // } &.special > img { display: block; @@ -31,7 +31,9 @@ margin-bottom: 20px; margin-left: 30%; } - + .step_content { + background-color: #fff; + } .step_title { margin-bottom: 10px; &:nth-child(odd) { @@ -41,7 +43,9 @@ color: $color-blue; } } - + &:not(:last-child) { + margin-bottom: 2rem; + } &:nth-child(odd) .step_title { color: $color-second; } @@ -64,7 +68,8 @@ // background-repeat: no-repeat; // background-position: top 50px center; z-index: 0; - .frise-autoscroll { + #frise-autoscroll { + // text-align: center; top: 3rem; } .step { @@ -85,6 +90,9 @@ @media screen and (max-width: 799px) { .timeline { + #frise-autoscroll { + display: none; + } .step { width: 100%; &.is-flex { diff --git a/resources/sass/_utils.scss b/resources/sass/_utils.scss index 55453c6..816461d 100644 --- a/resources/sass/_utils.scss +++ b/resources/sass/_utils.scss @@ -1,93 +1,95 @@ -.align-center{ - text-align:center; +.align-center { + text-align: center; } -.align-left{ - text-align:left; +.align-left { + text-align: left; +} +.align-justify { + text-align: justify; +} +.bold { + font-weight: bold; } -.bold{ - font-weight:bold; +.ttu { + text-transform: uppercase; } -.ttu{ - text-transform:uppercase; +.has-bckg--grey { + background-color: #f5f5f5; } -.has-bckg--grey{ - background-color:#f5f5f5; -} - -.is-flex{ - display:flex; - &.vertical-center{ - align-items:center; +.is-flex { + display: flex; + &.vertical-center { + align-items: center; } - &.start{ - align-items:flex-start; + &.start { + align-items: flex-start; } - &.wrap{ - flex-wrap:wrap; + &.wrap { + flex-wrap: wrap; } - &.space-between{ - justify-content:space-between; + &.space-between { + justify-content: space-between; } } -.is-small{ - margin-top:35px; - margin-bottom:35px; - font-size:12px; +.is-small { + margin-top: 35px; + margin-bottom: 35px; + font-size: 12px; } -.p-rel{ - position:relative; +.p-rel { + position: relative; } -.p-abs{ - position:absolute; +.p-abs { + position: absolute; } -.color-red{ - color:$color-second; +.color-red { + color: $color-second; } -.color-blue{ - color:$color-blue; +.color-blue { + color: $color-blue; } -.color-yellow{ - color:$color-main; +.color-yellow { + color: $color-main; } -.font-size-medium { - font-size:45px; +.font-size-medium { + font-size: 45px; } -@media screen and (min-width: 800px){ - .is-flex .w50{ - flex-basis:50%; - &:nth-child(2){ - margin-left:35px; +@media screen and (min-width: 800px) { + .is-flex .w50 { + flex-basis: 50%; + &:nth-child(2) { + margin-left: 35px; } } - .is-flex .w100{ - flex-basis:100%; - &:nth-child(1){ - padding-right:185px; + .is-flex .w100 { + flex-basis: 100%; + &:nth-child(1) { + padding-right: 185px; } - &:nth-child(2){ - margin-left:35px; + &:nth-child(2) { + margin-left: 35px; } } } -@media screen and (max-width: 799px){ - .is-flex{ +@media screen and (max-width: 799px) { + .is-flex { flex-direction: column; } - .smrt-align-center{ - text-align:center; + .smrt-align-center { + text-align: center; } -} \ No newline at end of file +} diff --git a/resources/views/a-propos.blade.php b/resources/views/a-propos.blade.php index ec3e32e..0f1b2b5 100644 --- a/resources/views/a-propos.blade.php +++ b/resources/views/a-propos.blade.php @@ -39,43 +39,43 @@
-