Merge branch 'master' into cho-refactor-404

epfl-si · Apr 25, 2023 · c8db62d · c8db62d
2 parents 212ef86 + 7d1fb12
commit c8db62d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 EPFL Theme Elements
 ===================
 
+### v6.2.3 / 2023-04-25
+
+- Update Elements to 4.2.1
+
+### v6.2.2 / 2023-03-27
+
+- Update Elements to 4.2.0
+- Transfer images for email templating to Elements
+
 ### v6.2.1 / 2023-03-01
 
 - Update Elements to 4.1.0

diff --git a/dist/css/elements.min.css b/dist/css/elements.min.css
diff --git a/dist/icons/square.png b/dist/icons/square.png
diff --git a/dist/js/elements.min.js b/dist/js/elements.min.js
diff --git a/grunt/copy.js b/grunt/copy.js
@@ -18,7 +18,9 @@ module.exports = {
         'favicons/apple-touch-icon.png',
         'favicons/favicon-16.png',
         'favicons/favicon-32.png',
-        'favicons/favicon.ico'
+        'favicons/favicon.ico',
+        'images/email/epfl-logo.png',
+        'images/email/square.png'
       ],
       dest: 'dist/icons/',
       nonull: true
@@ -28,12 +30,6 @@ module.exports = {
       src: ['images/icons/**'],
       dest: 'dist/',
       nonull: true
-    }, {
-      expand: true,
-      cwd: 'src/',
-      src: ['icons/**'],
-      dest: 'dist/',
-      nonull: true
     }]
   },
   release: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epfl-theme-elements",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "description": "EPFL Web 2018 Styleguide based on elements",
   "keywords": [
     "EPFL",
@@ -42,7 +42,7 @@
     "load-grunt-config": "^4.0.1"
   },
   "dependencies": {
-    "epfl-elements": "4.1.0",
+    "epfl-elements": "4.2.1",
     "jquery": "3.6.0"
   }
 }
diff --git a/src/icons/epfl-logo.png b/src/icons/epfl-logo.png
diff --git a/src/icons/square.png b/src/icons/square.png
diff --git a/yarn.lock b/yarn.lock
@@ -554,10 +554,10 @@ end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-epfl-elements@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/epfl-elements/-/epfl-elements-4.1.0.tgz#639f8d708c2a1558cdbdfe9ae961a1f842a13ca9"
-  integrity sha512-vj5rQO/yhYg3g8tPKRWFKX87y16SsdFCpixIYFDDQRCQNxbAAqipO9KiEDT4s4HixpxkEERb+kq7guguq761mQ==
+epfl-elements@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/epfl-elements/-/epfl-elements-4.2.1.tgz#9f9d2d48a724989a4a17611c4bf70936824965c0"
+  integrity sha512-PSBRINLEkJetlHo60Xf2jDS9G6Z3aei810I7Al+sayrfPrOvYNDGIx0DX1edzD8x5c+2y7jV8AFemGKmSWsm1g==
   dependencies:
     "@selectize/selectize" "^0.13.6"
     bootstrap "^4.5.2"