Merge branch 'main' of https://github.com/epfl-ada/ada-2024-project-a…

…dvanceddestroyers0fall
epfl-ada · Dec 17, 2024 · 64d9169 · 64d9169
2 parents 1016543 + a60e5dc
commit 64d9169
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/blog_P3/.DS_Store b/blog_P3/.DS_Store
diff --git a/blog_P3/assets/main.scss b/blog_P3/assets/main.scss
@@ -235,7 +235,7 @@ body {
   position: relative;
   width: 100%;
   //height: 500px; //Normal map size´
-  transition: all 0.5s ease-in-out; // Smooth transition for PiP mode
+  transition: all 1s ease-in-out; // Smooth transition for PiP mode
   overflow: hidden
 }
 
@@ -253,7 +253,7 @@ body {
   background: white; // Fallback background
   border-radius: 12px; // Rounded corners 
   cursor: grab; // Show the grab cursor 
-  transition: all 0.8s ease-in-out; // Disable transitions for smooth dragging
+  transition: all 1.5s ease-in-out; // Disable transitions for smooth dragging
 }
 /* END OF PIP*/
 

diff --git a/blog_P3/assets_perso/.DS_Store b/blog_P3/assets_perso/.DS_Store
diff --git a/blog_P3/assets_perso/js/mapdata.js b/blog_P3/assets_perso/js/mapdata.js
@@ -1632,7 +1632,7 @@ var simplemaps_worldmap_mapdata={
       name: "East Asia",
       states: ['CN', 'JP', 'MN', 'HK', 'KR', 'TW'],
       zoomable: "no",
-      color: "#B1A3E0",
+      color: "#5c1165",
       url: "javascript:loadRegionContent('EA')"
     },
     "3": {
@@ -1641,7 +1641,7 @@ var simplemaps_worldmap_mapdata={
         "IN"
       ], 
       zoomable: "no",
-      color: "#9585C8",
+      color: "#009392",
       url: "javascript:loadRegionContent('IN')"
     }
   }

diff --git a/blog_P3/assets_perso/js/pip-map.js b/blog_P3/assets_perso/js/pip-map.js
@@ -27,12 +27,14 @@ document.addEventListener("DOMContentLoaded", () => {
     // const mapOffsetTop = mapContainer.offsetTop;
     // const mapHeight = mapContainer.offsetHeight;
     // const viewportHeight = window.innerHeight;
-    // const offsetThreshold = mapOffsetTop + mapHeight - viewportHeight + 2700;
+    // const offsetThreshold = mapOffsetTop + mapHeight - viewportHeight + 4000;
     const scrollPosition = window.scrollY;
     const mapOffsetTop = mapContainer.offsetTop;
     const mapHeight = mapContainer.offsetHeight;
     const viewportHeight = window.innerHeight;
-    const offsetThreshold = mapOffsetTop + mapHeight - viewportHeight;
+    const introHeight = document.getElementById("typewriter-title").offsetHeight; 
+    const synopsisHeight = document.getElementById("typewriter-synopsis").offsetHeight;
+    const offsetThreshold = mapOffsetTop + mapHeight - viewportHeight + introHeight + synopsisHeight + 1600;
 
     if (scrollPosition > offsetThreshold) {
       scrollTimeout = setTimeout(() => {

diff --git a/blog_P3/index.markdown b/blog_P3/index.markdown
@@ -29,7 +29,13 @@ title:
 
 
 # Graphe countries+bulles
-Ça papote en 2spi
+<div class="flourish-embed flourish-hierarchy" data-src="visualisation/20799079">
+  <script src="https://public.flourish.studio/resources/embed.js"></script>
+  <noscript>
+    <img src="https://public.flourish.studio/visualisation/20799079/thumbnail" width="80%" max-width="800px"  height="500px" margin="auto" alt="hierarchy visualization" />
+  </noscript>
+</div>
+
 
 # Big map d'orientation
 <!-- div de la map to be interactive inshallah -->