From 5c16ff54b346365a482160ea1c75f9c0f7b4091e Mon Sep 17 00:00:00 2001 From: ouidade Date: Thu, 25 Apr 2024 17:42:54 +0200 Subject: [PATCH] aside --- .../colloque2024/css-compiled/index.css | 21 ++ .../css-compiled/pages/layout.css | 1 + .../css/components/footer/footer.scss | 4 + .../custom/colloque2024/css/pages/layout.scss | 6 +- .../colloque2024/css/pages/presentation.scss | 28 +++ .../images/fond-ronds-trace-aside.svg | 80 ++++++ .../images/fonds-ronds-trace-aside.svg | 36 +++ .../custom/colloque2024/js/animation-aside.js | 21 ++ .../node/node--presentation.html.twig | 79 ++++-- .../template/page--front.html.twig | 232 +++++++++--------- 10 files changed, 368 insertions(+), 140 deletions(-) create mode 100644 web/themes/custom/colloque2024/images/fond-ronds-trace-aside.svg create mode 100644 web/themes/custom/colloque2024/images/fonds-ronds-trace-aside.svg create mode 100644 web/themes/custom/colloque2024/js/animation-aside.js diff --git a/web/themes/custom/colloque2024/css-compiled/index.css b/web/themes/custom/colloque2024/css-compiled/index.css index f16ac3a1..393d7815 100644 --- a/web/themes/custom/colloque2024/css-compiled/index.css +++ b/web/themes/custom/colloque2024/css-compiled/index.css @@ -517,6 +517,7 @@ body #content-ontop { top: -1200px; } body #background-animated { + width: 100VW; z-index: -1; position: relative; left: -400px; } @@ -701,6 +702,24 @@ header #block-colloque2024-mainnavigation ul li { margin: 2rem 0; } } #presentation .__wrapper { margin-top: 1rem; } + #presentation.main { + max-width: 100vw; + margin: 0; + display: flex; } + +.layout { + display: flex; + flex-direction: row; } + .layout #aside-animated { + display: flex; + z-index: -1; + position: absolute; + width: 25%; + left: 0; + margin: auto; + padding: auto; } + .layout #aside-animated svg { + margin: auto; } .container.programme { padding-top: 1.5rem; } @@ -1972,6 +1991,8 @@ footer { height: auto; padding: 2rem 0 0 0; margin-top: 2rem; } + footer .container { + max-width: 90vw; } footer > .d-flex > div { margin-bottom: 1.5rem; } @media (min-width: 992px) { diff --git a/web/themes/custom/colloque2024/css-compiled/pages/layout.css b/web/themes/custom/colloque2024/css-compiled/pages/layout.css index f4749717..fb9d5e91 100644 --- a/web/themes/custom/colloque2024/css-compiled/pages/layout.css +++ b/web/themes/custom/colloque2024/css-compiled/pages/layout.css @@ -11,6 +11,7 @@ body #content-ontop { top: -1200px; } body #background-animated { + width: 100VW; z-index: -1; position: relative; left: -400px; } diff --git a/web/themes/custom/colloque2024/css/components/footer/footer.scss b/web/themes/custom/colloque2024/css/components/footer/footer.scss index ae72de1e..4279a7ce 100644 --- a/web/themes/custom/colloque2024/css/components/footer/footer.scss +++ b/web/themes/custom/colloque2024/css/components/footer/footer.scss @@ -5,6 +5,10 @@ footer{ height: auto; padding: 2rem 0 0 0; margin-top:2rem; + .container{ + max-width: 90vw; + + } & > .d-flex{ & > div{ margin-bottom: 1.5rem; diff --git a/web/themes/custom/colloque2024/css/pages/layout.scss b/web/themes/custom/colloque2024/css/pages/layout.scss index 78bcb77e..07639806 100644 --- a/web/themes/custom/colloque2024/css/pages/layout.scss +++ b/web/themes/custom/colloque2024/css/pages/layout.scss @@ -14,10 +14,10 @@ body { top: -1200px; } #background-animated{ - z-index: -1; - position: relative; + width: 100VW; + z-index: -1; + position: relative; left: -400px; - } } diff --git a/web/themes/custom/colloque2024/css/pages/presentation.scss b/web/themes/custom/colloque2024/css/pages/presentation.scss index 159a2310..900a1be3 100644 --- a/web/themes/custom/colloque2024/css/pages/presentation.scss +++ b/web/themes/custom/colloque2024/css/pages/presentation.scss @@ -15,4 +15,32 @@ .__wrapper{ margin-top: 1rem; } + + &.main{ + max-width: 100vw; + margin: 0; + display: flex; + } + +} + + +.layout{ + display: flex; + flex-direction: row; + #main-content-node{ + } + #aside-animated{ + display: flex; + z-index: -1; + position: absolute; + width: 25%; + left: 0; + margin: auto; + padding: auto; + svg{ + margin: auto; + } + } + } diff --git a/web/themes/custom/colloque2024/images/fond-ronds-trace-aside.svg b/web/themes/custom/colloque2024/images/fond-ronds-trace-aside.svg new file mode 100644 index 00000000..632fc257 --- /dev/null +++ b/web/themes/custom/colloque2024/images/fond-ronds-trace-aside.svg @@ -0,0 +1,80 @@ + + + + diff --git a/web/themes/custom/colloque2024/images/fonds-ronds-trace-aside.svg b/web/themes/custom/colloque2024/images/fonds-ronds-trace-aside.svg new file mode 100644 index 00000000..016c34b7 --- /dev/null +++ b/web/themes/custom/colloque2024/images/fonds-ronds-trace-aside.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/themes/custom/colloque2024/js/animation-aside.js b/web/themes/custom/colloque2024/js/animation-aside.js new file mode 100644 index 00000000..9b008bb6 --- /dev/null +++ b/web/themes/custom/colloque2024/js/animation-aside.js @@ -0,0 +1,21 @@ +let dropdowns1 = document.getElementById('circle_vert_clair_erable_3'); + + function slideDown() { + let translateY = 0; // Position de départ (en bas) + let duration = 17000; // Durée de l'animation en millisecondes + let startTime = null; // Temps de départ de l'animation + function animate(timestamp) { + if (!startTime) startTime = timestamp; // Initialise le temps de départ si ce n'est pas déjà fait + let progress = (timestamp - startTime) / duration; // Calcul de la progression de l'animation + progress = Math.min(progress, 0.3); // Limite la progression à 0.3 (pour éviter un dépassement) + translateY = 410 * progress * (0.48 - progress); // Réduction de la vitesse vers la fin de l'animation + dropdown1.style.transform = `translateY(${translateY}%)`; // Appliquer la transformation + if (progress < 0.999999) { + requestAnimationFrame(animate); + } +} +requestAnimationFrame(animate); +} +slideDown(); // Lancer l'animation lorsque la page est chargée + + diff --git a/web/themes/custom/colloque2024/template/node/node--presentation.html.twig b/web/themes/custom/colloque2024/template/node/node--presentation.html.twig index 7e14ad08..807700f9 100644 --- a/web/themes/custom/colloque2024/template/node/node--presentation.html.twig +++ b/web/themes/custom/colloque2024/template/node/node--presentation.html.twig @@ -72,26 +72,65 @@ * @ingroup themeable */ #} -
-{{content.field_image}} -
- -
-

{{label}}

-
-
-
- {% include 'themes/custom/popsu_colloque/template/components/share_rs.html.twig' with { page : 'presentation' } %} -
-
- {{content.body}} +
+ +
+
+ {{content.field_image}}
-
- {{content.field_add_participant}} -
- {{content.field_les_notes}} + +
+

{{label}}

-
-
- +
+
+ {% include 'themes/custom/popsu_colloque/template/components/share_rs.html.twig' with { page : 'presentation' } %} +
+
+ {{content.body}} + +
+
+ {{content.field_add_participant}} +
+ {{content.field_les_notes}} +
+
+
+ +
+
diff --git a/web/themes/custom/colloque2024/template/page--front.html.twig b/web/themes/custom/colloque2024/template/page--front.html.twig index 13b410ce..9ceda3ae 100644 --- a/web/themes/custom/colloque2024/template/page--front.html.twig +++ b/web/themes/custom/colloque2024/template/page--front.html.twig @@ -64,126 +64,124 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +