Merge pull request #234 from PrestaShop/develop

Release 2.0.1
PrestaShop · Aug 2, 2024 · 5aab412 · 5aab412
2 parents eaf06e5 + 1c255d9
commit 5aab412
Show file tree

Hide file tree

Showing 44 changed files with 211 additions and 564 deletions.
diff --git a/dist/css/054ede802678babb35105245bc01d897.woff2 b/dist/css/054ede802678babb35105245bc01d897.woff2
diff --git a/dist/css/0d5d2a0d3b71682e16e63dffe770ec8d.woff2 b/dist/css/0d5d2a0d3b71682e16e63dffe770ec8d.woff2
diff --git a/dist/css/25f8709c85f48ac11fd6f373a7a0212f.woff2 b/dist/css/25f8709c85f48ac11fd6f373a7a0212f.woff2
diff --git a/dist/css/2eb80a8b2e5aebc410637a0af346ba37.woff b/dist/css/2eb80a8b2e5aebc410637a0af346ba37.woff
diff --git a/dist/css/3ab33516c98dcd5a815622c9f92207c1.woff2 b/dist/css/3ab33516c98dcd5a815622c9f92207c1.woff2
diff --git a/dist/css/3d8d457e5b04886f03119bdfc1830223.woff b/dist/css/3d8d457e5b04886f03119bdfc1830223.woff
diff --git a/dist/css/3fb6e352753c4fd7ee96e6481a5266fe.woff2 b/dist/css/3fb6e352753c4fd7ee96e6481a5266fe.woff2
diff --git a/dist/css/4176602f5679bb95f106c6546d88ae93.woff2 b/dist/css/4176602f5679bb95f106c6546d88ae93.woff2
diff --git a/dist/css/4b5cd12c1892504cf2bc66390627c223.woff b/dist/css/4b5cd12c1892504cf2bc66390627c223.woff
diff --git a/dist/css/5f91ee0d8ae3ad82563a588e75272340.woff2 b/dist/css/5f91ee0d8ae3ad82563a588e75272340.woff2
diff --git a/dist/css/64c7f5ae963b791d88ccfd1c3f9646e1.woff2 b/dist/css/64c7f5ae963b791d88ccfd1c3f9646e1.woff2
diff --git a/dist/css/67ee700d73d0a54450868a01ce739c0f.woff b/dist/css/67ee700d73d0a54450868a01ce739c0f.woff
diff --git a/dist/css/6efabcb8571965979c45e32c2291727d.woff b/dist/css/6efabcb8571965979c45e32c2291727d.woff
diff --git a/dist/css/74e8ab3f4147ae70b729f09992229477.woff b/dist/css/74e8ab3f4147ae70b729f09992229477.woff
diff --git a/dist/css/7a4911edaf1a504112a4dde78bb24041.woff2 b/dist/css/7a4911edaf1a504112a4dde78bb24041.woff2
diff --git a/dist/css/8023de8d30adbf0aa44e38f63fd363c2.woff b/dist/css/8023de8d30adbf0aa44e38f63fd363c2.woff
diff --git a/dist/css/8e92f41154aba03dd91ee5ce20bdaef4.woff2 b/dist/css/8e92f41154aba03dd91ee5ce20bdaef4.woff2
diff --git a/dist/css/a157061fcd1bcc2a0c0aae69502c7e71.woff b/dist/css/a157061fcd1bcc2a0c0aae69502c7e71.woff
diff --git a/dist/css/a1f96d05f09dbb06b70317c166050afb.woff2 b/dist/css/a1f96d05f09dbb06b70317c166050afb.woff2
diff --git a/dist/css/a3db53d7fec7d810756041f6f64e0636.woff2 b/dist/css/a3db53d7fec7d810756041f6f64e0636.woff2
diff --git a/dist/css/a7516b96d68c7eb86785caa3c89e63ac.woff b/dist/css/a7516b96d68c7eb86785caa3c89e63ac.woff
diff --git a/dist/css/aabce859944e9b0f8bf399971e7e7050.woff b/dist/css/aabce859944e9b0f8bf399971e7e7050.woff
diff --git a/dist/css/acd5dac7f3829be5d8ee42edc72f9c75.woff2 b/dist/css/acd5dac7f3829be5d8ee42edc72f9c75.woff2
diff --git a/dist/css/ae8c5c922bdfddbdc5a48cfce4cbec30.woff b/dist/css/ae8c5c922bdfddbdc5a48cfce4cbec30.woff
diff --git a/dist/css/b5098d9ddcbc164330f5bf1b52192f69.woff b/dist/css/b5098d9ddcbc164330f5bf1b52192f69.woff
diff --git a/dist/css/b97f809ea9dd94b885298d3e9b06a31c.woff b/dist/css/b97f809ea9dd94b885298d3e9b06a31c.woff
diff --git a/dist/css/bootstrap-prestashop-ui-kit.css b/dist/css/bootstrap-prestashop-ui-kit.css
diff --git a/dist/css/bootstrap-prestashop-ui-kit.css.map b/dist/css/bootstrap-prestashop-ui-kit.css.map
diff --git a/dist/css/c5647269ad9334c5f91f82c1b6604964.woff b/dist/css/c5647269ad9334c5f91f82c1b6604964.woff
diff --git a/dist/css/c639fabb458e44141121ff61d65aaa3c.woff b/dist/css/c639fabb458e44141121ff61d65aaa3c.woff
diff --git a/dist/css/c9c6f1a4c09888b8dbdc7aca6c947400.woff2 b/dist/css/c9c6f1a4c09888b8dbdc7aca6c947400.woff2
diff --git a/dist/css/cb832daddc17835f978f068381c38b09.woff2 b/dist/css/cb832daddc17835f978f068381c38b09.woff2
diff --git a/dist/css/cd26166a2ace7d1c8a0db7394c7393ac.woff b/dist/css/cd26166a2ace7d1c8a0db7394c7393ac.woff
diff --git a/dist/css/ce92a4857beb796deedb2de32c2a640c.woff2 b/dist/css/ce92a4857beb796deedb2de32c2a640c.woff2
diff --git a/dist/css/d3afb76957c13ab7ea3825961f838eb7.woff b/dist/css/d3afb76957c13ab7ea3825961f838eb7.woff
diff --git a/dist/css/df149b0e0a34063407b0a483c195fff4.woff2 b/dist/css/df149b0e0a34063407b0a483c195fff4.woff2
diff --git a/dist/css/ee846a5974feaba7139625989bd9bb68.woff2 b/dist/css/ee846a5974feaba7139625989bd9bb68.woff2
diff --git a/dist/css/f074b50a1c3a4ae2b79dc5340bbedabd.woff b/dist/css/f074b50a1c3a4ae2b79dc5340bbedabd.woff
diff --git a/dist/css/f16460285d7ee089d39ebc6b59715a33.woff2 b/dist/css/f16460285d7ee089d39ebc6b59715a33.woff2
diff --git a/dist/js/prestashop-ui-kit.js b/dist/js/prestashop-ui-kit.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prestakit",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Prestashop UI Kit integration",
   "repository": {
     "type": "git",
@@ -24,15 +24,16 @@
     "url": "https://github.com/PrestaShop/prestashop-ui-kit/issues"
   },
   "dependencies": {
+    "@fontsource/ibm-plex-sans": "^5.0.20",
     "@ttskch/select2-bootstrap4-theme": "^1.5.2",
     "bootstrap": "^4.4.1",
     "jquery.growl": "^1.3.5",
     "material-design-icons-iconfont": "^6.7.0",
+    "material-symbols": "^0.21.2",
     "open-sans-fonts": "^1.6.2",
     "select2": "^4.0.5"
   },
   "devDependencies": {
-    "@fontsource/ibm-plex-sans": "^5.0.20",
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.12.3",
     "@babel/preset-env": "^7.12.1",

diff --git a/scss/_imports.scss b/scss/_imports.scss
@@ -1,76 +1,31 @@
 /* stylelint-disable */
-$FontPathIBMPlexSans: "~@fontsource/ibm-plex-sans";
+@use "~@fontsource/ibm-plex-sans/scss/mixins" as IBM;
+
+$material-symbols-font-path: '~material-symbols/';
 
 @mixin setFont() {
   @if $local-font {
 
     // IBM Plex Sans
-    @font-face {
-      font-family: "IBM Plex Sans";
-      font-style: normal;
-      font-weight: 200;
-      font-display: swap;
-      src:
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-200-normal.woff2") format("woff2"),
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-200-normal.woff") format("woff");
-    }
-
-    @font-face {
-      font-family: "IBM Plex Sans";
-      font-style: normal;
-      font-weight: 300;
-      font-display: swap;
-      src:
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-300-normal.woff2") format("woff2"),
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-300-normal.woff") format("woff");
-    }
-
-    @font-face {
-      font-family: "IBM Plex Sans";
-      font-style: normal;
-      font-weight: 400;
-      font-display: swap;
-      src:
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-400-normal.woff2") format("woff2"),
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-400-normal.woff") format("woff");
-    }
-
-    @font-face {
-      font-family: "IBM Plex Sans";
-      font-style: normal;
-      font-weight: 500;
-      font-display: swap;
-      src:
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-500-normal.woff2") format("woff2"),
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-500-normal.woff") format("woff");
-    }
-
-    @font-face {
-      font-family: "IBM Plex Sans";
-      font-style: normal;
-      font-weight: 600;
-      font-display: swap;
-      src:
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-600-normal.woff2") format("woff2"),
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-600-normal.woff") format("woff");
-    }
-
-    @font-face {
-      font-family: "IBM Plex Sans";
-      font-style: normal;
-      font-weight: 700;
-      font-display: swap;
-      src:
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-700-normal.woff2") format("woff2"),
-        url("#{$FontPathIBMPlexSans}/files/ibm-plex-sans-latin-700-normal.woff") format("woff");
-    }
+    @include IBM.faces(
+      $subsets: all,
+      $weights: (
+        200,
+        300,
+        400,
+        500,
+        600,
+        700,
+      ),
+      $styles: all
+    );
 
     // Material Symbols Outlined
     @font-face {
       font-family: "Material Symbols Outlined";
       font-style: normal;
       font-display: swap;
-      src: url("/fonts/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2") format("woff2"), url("/fonts/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf") format("truetype");
+      src: url("#{$material-symbols-font-path}material-symbols-outlined.woff2") format("woff2");
     }
   } @else {
     // IBM Plex Sans

diff --git a/scss/_root.scss b/scss/_root.scss
@@ -20,7 +20,7 @@ $cdk-primary: (
   "primary-500":        #bbb,
   "primary-600":        #5e5e5e,
   "primary-700":        #3f3f3d,
-  "primary-800":        #1b1c1d,
+  "primary-800":        #1d1d1b,
   "primary-900":        #101010
 ) !default;