Merge branch 'master' into cho-refactor-404

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '18.x'
       - run: yarn install
       - run: yarn test
       - run: yarn run release

CHANGELOG.md

@@ -1,6 +1,35 @@
 EPFL Theme Elements
 ===================
 
+### v6.7.0 / 2024-05-30
+
+- Update elements from 4.8.0 to 4.9.0
+
+### v6.6.0 / 2024-05-22
+
+- Update elements from 4.7.0 to 4.8.0
+
+### v6.5.1 / 2024-02-13
+
+- Update elements from 4.6.1 to 4.7.0
+
+### v6.5.0 / 2024-01-04
+
+- Update elements from 4.5.1 to 4.6.1
+- Sort footer social icons alphabetically
+- Bump word-wrap from 1.2.3 to 1.2.5
+- Bump semver from 6.3.0 to 6.3.1
+
+### v6.4.0 / 2023-10-16
+
+- Update elements from 4.2.1 to 4.5.1
+- Update Twitter logo in footer
+- Update grunt-contrib-cssmin from 4.0.0 to 5.0.0
+
+### v6.3.0 / 2023-06-15
+
+- Migrate to Google Analytics v4
+
 ### v6.2.3 / 2023-04-25
 
 - Update Elements to 4.2.1

README.md

@@ -68,7 +68,8 @@ dist/
 ├──images/
 │  └── icons/
 │      ├── icon-course-exercise.svg
-│      └── icon-course-project.svg
+│      ├── icon-course-project.svg
+│      └── icon-teaser-video.svg
 └──js/
    ├── elements.min.js.LICENSE.txt
    ├── elements.min.js

dist/js/vendors.min.js.LICENSE.txt

@@ -1,6 +1,6 @@
 /*!
-  * Bootstrap v4.6.0 (https://getbootstrap.com/)
-  * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v4.6.2 (https://getbootstrap.com/)
+  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "epfl-theme-elements",
-  "version": "6.2.3",
+  "version": "6.7.0",
   "description": "EPFL Web 2018 Styleguide based on elements",
   "keywords": [
     "EPFL",
@@ -15,34 +15,34 @@
   "license": "",
   "repository": "https://github.com/epfl-si/epfl-theme-elements.git",
   "engines": {
-    "node": ">=14"
+    "node": ">=18.18"
   },
   "main": "dist/js/elements.min.js",
   "scripts": {
     "test": "grunt test",
     "release": "grunt release"
   },
   "devDependencies": {
-    "eslint": "^8.16.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.0",
+    "eslint": "^8.57.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "grunt": "^1.5.3",
+    "eslint-plugin-promise": "^6.2.0",
+    "grunt": "^1.6.1",
     "grunt-compile-handlebars": "^2.0.3",
     "grunt-contrib-clean": "^2.0.1",
     "grunt-contrib-compress": "^2.0.0",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-cssmin": "^4.0.0",
-    "grunt-contrib-uglify": "^5.2.1",
+    "grunt-contrib-cssmin": "^5.0.0",
+    "grunt-contrib-uglify": "^5.2.2",
     "grunt-eslint": "^24.0.0",
     "grunt-replace": "^2.0.2",
     "js-yaml": "^4.1.0",
     "load-grunt-config": "^4.0.1"
   },
   "dependencies": {
-    "epfl-elements": "4.2.1",
-    "jquery": "3.6.0"
+    "epfl-elements": "4.9.0",
+    "jquery": "3.7.1"
   }
 }

src/includes/full/footer-scripts.html

@@ -1,3 +1,5 @@
+{{> gtm-body }}
+
 <script>
   svgPath = 'https://web2018.epfl.ch/{{VERSION}}/icons/icons.svg';
   featherSvgPath = 'https://web2018.epfl.ch/{{VERSION}}/icons/feather-sprite.svg';

src/includes/full/head.html

@@ -5,4 +5,4 @@
 
 <link rel="stylesheet" href="//web2018.epfl.ch/{{VERSION}}/css/elements.min.css">
 
-{{> gtag }}
+{{> gtm-head }}

src/includes/partials/footer-light-social-de.html

@@ -7,29 +7,29 @@
         <span class="sr-only">Folgen Sie uns auf Facebook.</span>
       </a>
     </li>
-    <li>
-      <a href="https://twitter.com/epfl_en" class="social-icon social-icon-twitter social-icon-negative" rel="noopener" target="_blank">
-        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-twitter"></use></svg>
-        <span class="sr-only">Folgen Sie uns auf Twitter.</span>
-      </a>
-    </li>
     <li>
       <a href="https://instagram.com/epflcampus" class="social-icon social-icon-instagram social-icon-negative" rel="noopener" target="_blank">
         <svg class="icon" aria-hidden="true"><use xlink:href="#icon-instagram"></use></svg>
         <span class="sr-only">Folgen Sie uns auf Instagram.</span>
       </a>
     </li>
-    <li>
-      <a href="https://www.youtube.com/user/epflnews" class="social-icon social-icon-youtube social-icon-negative" rel="noopener" target="_blank">
-        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-youtube"></use></svg>
-        <span class="sr-only">Folgen Sie uns auf YouTube.</span>
-      </a>
-    </li>
     <li>
       <a href="https://www.linkedin.com/school/epfl/" class="social-icon social-icon-linkedin social-icon-negative" rel="noopener" target="_blank">
         <svg class="icon" aria-hidden="true"><use xlink:href="#icon-linkedin"></use></svg>
         <span class="sr-only">Folgen Sie uns auf LinkedIn.</span>
       </a>
     </li>
+    <li>
+      <a href="https://x.com/epfl_en" class="social-icon social-icon-x social-icon-negative" rel="noopener" target="_blank">
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-x"></use></svg>
+        <span class="sr-only">Folgen Sie uns auf X.</span>
+      </a>
+    </li>
+    <li>
+      <a href="https://www.youtube.com/user/epflnews" class="social-icon social-icon-youtube social-icon-negative" rel="noopener" target="_blank">
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-youtube"></use></svg>
+        <span class="sr-only">Folgen Sie uns auf YouTube.</span>
+      </a>
+    </li>
   </ul>
 </div>

src/includes/partials/footer-light-social-en.html

@@ -7,29 +7,29 @@
         <span class="sr-only">Follow us on Facebook.</span>
       </a>
     </li>
-    <li>
-      <a href="https://twitter.com/epfl_en" class="social-icon social-icon-twitter social-icon-negative" rel="noopener" target="_blank">
-        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-twitter"></use></svg>
-        <span class="sr-only">Follow us on Twitter.</span>
-      </a>
-    </li>
     <li>
       <a href="https://instagram.com/epflcampus" class="social-icon social-icon-instagram social-icon-negative" rel="noopener" target="_blank">
         <svg class="icon" aria-hidden="true"><use xlink:href="#icon-instagram"></use></svg>
         <span class="sr-only">Follow us on Instagram.</span>
       </a>
     </li>
-    <li>
-      <a href="https://www.youtube.com/user/epflnews" class="social-icon social-icon-youtube social-icon-negative" rel="noopener" target="_blank">
-        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-youtube"></use></svg>
-        <span class="sr-only">Follow us on Youtube.</span>
-      </a>
-    </li>
     <li>
       <a href="https://www.linkedin.com/school/epfl/" class="social-icon social-icon-linkedin social-icon-negative" rel="noopener" target="_blank">
         <svg class="icon" aria-hidden="true"><use xlink:href="#icon-linkedin"></use></svg>
         <span class="sr-only">Follow us on LinkedIn.</span>
       </a>
     </li>
+    <li>
+      <a href="https://x.com/epfl_en" class="social-icon social-icon-x social-icon-negative" rel="noopener" target="_blank">
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-x"></use></svg>
+        <span class="sr-only">Follow us on X.</span>
+      </a>
+    </li>
+    <li>
+      <a href="https://www.youtube.com/user/epflnews" class="social-icon social-icon-youtube social-icon-negative" rel="noopener" target="_blank">
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-youtube"></use></svg>
+        <span class="sr-only">Follow us on Youtube.</span>
+      </a>
+    </li>
   </ul>
 </div>

src/includes/partials/footer-light-social-fr.html

@@ -7,29 +7,29 @@
         <span class="sr-only">Suivez-nous sur Facebook.</span>
       </a>
     </li>
-    <li>
-      <a href="https://twitter.com/epfl" class="social-icon social-icon-twitter social-icon-negative" rel="noopener" target="_blank">
-        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-twitter"></use></svg>
-        <span class="sr-only">Suivez-nous sur Twitter.</span>
-      </a>
-    </li>
     <li>
       <a href="https://instagram.com/epflcampus" class="social-icon social-icon-instagram social-icon-negative" rel="noopener" target="_blank">
         <svg class="icon" aria-hidden="true"><use xlink:href="#icon-instagram"></use></svg>
         <span class="sr-only">Suivez-nous sur Instagram.</span>
       </a>
     </li>
-    <li>
-      <a href="https://www.youtube.com/user/epflnews" class="social-icon social-icon-youtube social-icon-negative" rel="noopener" target="_blank">
-        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-youtube"></use></svg>
-        <span class="sr-only">Suivez-nous sur Youtube.</span>
-      </a>
-    </li>
     <li>
       <a href="https://www.linkedin.com/school/epfl/" class="social-icon social-icon-linkedin social-icon-negative" rel="noopener" target="_blank">
         <svg class="icon" aria-hidden="true"><use xlink:href="#icon-linkedin"></use></svg>
         <span class="sr-only">Suivez-nous sur LinkedIn.</span>
       </a>
     </li>
+    <li>
+      <a href="https://x.com/epfl" class="social-icon social-icon-x social-icon-negative" rel="noopener" target="_blank">
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-x"></use></svg>
+        <span class="sr-only">Suivez-nous sur X.</span>
+      </a>
+    </li>
+    <li>
+      <a href="https://www.youtube.com/user/epflnews" class="social-icon social-icon-youtube social-icon-negative" rel="noopener" target="_blank">
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-youtube"></use></svg>
+        <span class="sr-only">Suivez-nous sur Youtube.</span>
+      </a>
+    </li>
   </ul>
 </div>

src/includes/partials/gtm-body.html

@@ -0,0 +1,2 @@
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PJGBG5R"
+  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>

src/includes/partials/gtm-head.html

@@ -0,0 +1,5 @@
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-PJGBG5R');</script>