Merge pull request #94 from gsoft-inc/feature/update-hopper-tokens

Feature/update hopper tokens
gsoft-inc · Mar 13, 2024 · f9e7866 · f9e7866
2 parents 4d7604b + e2db2ab
commit f9e7866
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 77 deletions.
diff --git a/.changeset/red-dolphins-smoke.md b/.changeset/red-dolphins-smoke.md
@@ -0,0 +1,5 @@
+---
+"@orbit-ui/transition-css": minor
+---
+
+Removed local assets to use Hopper font tokens
diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -10,7 +10,7 @@ import { Themes } from "./styles/themes";
 
 if (!isChromatic) {
     // Custom font makes chromatic inconsistent and cause "false positive". View https://www.chromatic.com/docs/resource-loading#loading-custom-fonts.
-    import("@css/font/index.css");
+    import("@css/fonts.css");
 } else {
     import("./styles/chromatic.css");
 }

diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -19,6 +19,7 @@ function addWebpackAliases(config) {
         // we could use the ~, but this only works for webpack, and vite doesn't support it.
         // also, since we are not using ~, it's considered a relative path, so we add the ./ to the alias.
         "./@hopper-ui/icons/index.css": path.resolve(__dirname, "../node_modules/@hopper-ui/icons/dist/index.css"),
+        "./@hopper-ui/tokens/fonts.css": path.resolve(__dirname, "../node_modules/@hopper-ui/tokens/dist/fonts.css"),
         "./@hopper-ui/styled-system/index.css": path.resolve(__dirname, "../node_modules/@hopper-ui/styled-system/dist/index.css"),
     };
 }

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -11,6 +11,9 @@
     "license": "Apache-2.0",
     "main": "src/index.css",
     "style": "src/index.css",
+    "dependencies": {
+        "@hopper-ui/tokens": "^3.2.1"
+    },
     "publishConfig": {
         "access": "public",
         "provenance": true

diff --git a/packages/css/src/font/assets/abc-favorit-mono/ABCFavoritMono-Regular.otf b/packages/css/src/font/assets/abc-favorit-mono/ABCFavoritMono-Regular.otf
diff --git a/packages/css/src/font/assets/abc-favorit-mono/ABCFavoritMono-Regular.woff b/packages/css/src/font/assets/abc-favorit-mono/ABCFavoritMono-Regular.woff
diff --git a/packages/css/src/font/assets/abc-favorit-mono/ABCFavoritMono-Regular.woff2 b/packages/css/src/font/assets/abc-favorit-mono/ABCFavoritMono-Regular.woff2
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Bold.otf b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Bold.otf
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Bold.woff b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Bold.woff
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Bold.woff2 b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Bold.woff2
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Medium.otf b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Medium.otf
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Medium.woff b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Medium.woff
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Medium.woff2 b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Medium.woff2
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Regular.otf b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Regular.otf
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Regular.woff b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Regular.woff
diff --git a/packages/css/src/font/assets/abc-favorit/ABCFavorit-Regular.woff2 b/packages/css/src/font/assets/abc-favorit/ABCFavorit-Regular.woff2
diff --git a/packages/css/src/font/assets/inter/Inter-Bold.otf b/packages/css/src/font/assets/inter/Inter-Bold.otf
diff --git a/packages/css/src/font/assets/inter/Inter-BoldItalic.otf b/packages/css/src/font/assets/inter/Inter-BoldItalic.otf
diff --git a/packages/css/src/font/assets/inter/Inter-Medium.otf b/packages/css/src/font/assets/inter/Inter-Medium.otf
diff --git a/packages/css/src/font/assets/inter/Inter-MediumItalic.otf b/packages/css/src/font/assets/inter/Inter-MediumItalic.otf
diff --git a/packages/css/src/font/assets/inter/Inter-Regular.otf b/packages/css/src/font/assets/inter/Inter-Regular.otf
diff --git a/packages/css/src/font/assets/inter/Inter-SemiBold.otf b/packages/css/src/font/assets/inter/Inter-SemiBold.otf
diff --git a/packages/css/src/font/assets/inter/Inter-SemiBoldItalic.otf b/packages/css/src/font/assets/inter/Inter-SemiBoldItalic.otf
diff --git a/packages/css/src/font/index.css b/packages/css/src/font/index.css
diff --git a/packages/css/src/fonts.css b/packages/css/src/fonts.css
@@ -0,0 +1 @@
+@import "@hopper-ui/tokens/fonts.css";
diff --git a/packages/css/src/index.css b/packages/css/src/index.css
@@ -1,2 +1,2 @@
-@import "./font/index.css";
 @import "./normalize.css";
+@import "./fonts.css";
diff --git a/yarn.lock b/yarn.lock
@@ -1587,6 +1587,11 @@
     "@react-aria/ssr" "^3.9.1"
     clsx "^2.1.0"
 
+"@hopper-ui/[email protected]":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@hopper-ui/tokens/-/tokens-3.2.1.tgz#b0a895a580ceec4767a6d8d6e7e89ac96d00f3fe"
+  integrity sha512-JwWtudZESiceYzzytUWtW0H3zMy51Y0tPhAak+hrI7Sk/oBgPeGNTHV7Q9iesqvNswoOVIOQJCasnjsUoIm/fA==
+
 "@humanwhocodes/config-array@^0.11.8":
   version "0.11.8"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"