+
);
- },
+ }
]
};
diff --git a/packages/components/package.json b/packages/components/package.json
index 74f337ab2..46bc53fc2 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -38,11 +38,11 @@
"postpack": "clean-package restore"
},
"dependencies": {
+ "@interlay/coin-icons": "workspace:*",
"@interlay/hooks": "workspace:*",
"@interlay/icons": "workspace:*",
- "@interlay/coin-icons": "workspace:*",
- "@interlay/theme": "workspace:*",
"@interlay/system": "workspace:*",
+ "@interlay/theme": "workspace:*",
"@react-aria/accordion": "3.0.0-alpha.20",
"@react-aria/breadcrumbs": "^3.5.4",
"@react-aria/button": "^3.8.1",
@@ -76,7 +76,6 @@
"@react-stately/toggle": "^3.6.1",
"@react-stately/tooltip": "^3.4.3",
"@react-stately/tree": "^3.7.1",
- "@react-types/meter": "^3.3.3",
"react-transition-group": "^4.4.5"
},
"peerDependencies": {
@@ -85,14 +84,16 @@
"styled-components": ">=6.0.0"
},
"devDependencies": {
+ "@interlay/test-utils": "workspace:*",
"@react-types/grid": "^3.2.0",
+ "@react-types/meter": "^3.3.3",
"@react-types/shared": "^3.19.0",
+ "@react-types/tabs": "^3.3.2",
"@types/react-transition-group": "^4.4.6",
"@types/styled-components": "^5.1.26",
"clean-package": "^2.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "@interlay/test-utils": "workspace:*",
"styled-components": "^6.0.7"
},
"clean-package": "../../clean-package.config.json"
diff --git a/packages/core/theme/src/css/theme.base.css b/packages/core/theme/src/css/theme.base.css
index 02b00477e..974c5e938 100644
--- a/packages/core/theme/src/css/theme.base.css
+++ b/packages/core/theme/src/css/theme.base.css
@@ -1,38 +1,11 @@
@import url('reset.css');
-@font-face {
- font-family: 'inter';
- src: url('../fonts/inter/Inter-Light.ttf') format('truetype');
- font-weight: 300; /* light */
- font-style: normal;
-}
-@font-face {
- font-family: 'inter';
- src: url('../fonts/inter/Inter-Regular.ttf') format('truetype');
- font-weight: 400; /* regular */
- font-style: normal;
-}
-@font-face {
- font-family: 'inter';
- src: url('../fonts/inter/Inter-Medium.ttf') format('truetype');
- font-weight: 500; /* medium */
- font-style: normal;
-}
-@font-face {
- font-family: 'inter';
- src: url('../fonts/inter/Inter-Bold.ttf') format('truetype');
- font-weight: 700; /* bold */
- font-style: normal;
-}
-
* {
box-sizing: border-box;
- font-family: 'inter';
+ font-family: inherit;
}
:root {
- --fonts-primary: 'inter';
-
--font-weights-light: 300;
--font-weights-book: 400;
--font-weights-medium: 500;
diff --git a/packages/core/theme/src/fonts/inter/Inter-Black.ttf b/packages/core/theme/src/fonts/inter/Inter-Black.ttf
deleted file mode 100644
index 5aecf7dc4..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-Black.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-Bold.ttf b/packages/core/theme/src/fonts/inter/Inter-Bold.ttf
deleted file mode 100644
index 8e82c70d1..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-Bold.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-ExtraBold.ttf b/packages/core/theme/src/fonts/inter/Inter-ExtraBold.ttf
deleted file mode 100644
index cb4b8217f..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-ExtraBold.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-ExtraLight.ttf b/packages/core/theme/src/fonts/inter/Inter-ExtraLight.ttf
deleted file mode 100644
index 64aee30a4..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-ExtraLight.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-Light.ttf b/packages/core/theme/src/fonts/inter/Inter-Light.ttf
deleted file mode 100644
index 9e265d890..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-Light.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-Medium.ttf b/packages/core/theme/src/fonts/inter/Inter-Medium.ttf
deleted file mode 100644
index b53fb1c4a..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-Medium.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-Regular.ttf b/packages/core/theme/src/fonts/inter/Inter-Regular.ttf
deleted file mode 100644
index 8d4eebf20..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-Regular.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-SemiBold.ttf b/packages/core/theme/src/fonts/inter/Inter-SemiBold.ttf
deleted file mode 100644
index c6aeeb16a..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-SemiBold.ttf and /dev/null differ
diff --git a/packages/core/theme/src/fonts/inter/Inter-Thin.ttf b/packages/core/theme/src/fonts/inter/Inter-Thin.ttf
deleted file mode 100644
index 7aed55d56..000000000
Binary files a/packages/core/theme/src/fonts/inter/Inter-Thin.ttf and /dev/null differ
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f2731733b..8fc1efcd9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -285,9 +285,6 @@ importers:
'@react-stately/tree':
specifier: ^3.7.1
version: 3.7.2(react@18.2.0)
- '@react-types/meter':
- specifier: ^3.3.3
- version: 3.3.4(react@18.2.0)
react-transition-group:
specifier: ^4.4.5
version: 4.4.5(react-dom@18.2.0)(react@18.2.0)
@@ -298,9 +295,15 @@ importers:
'@react-types/grid':
specifier: ^3.2.0
version: 3.2.1(react@18.2.0)
+ '@react-types/meter':
+ specifier: ^3.3.3
+ version: 3.3.4(react@18.2.0)
'@react-types/shared':
specifier: ^3.19.0
version: 3.20.0(react@18.2.0)
+ '@react-types/tabs':
+ specifier: ^3.3.2
+ version: 3.3.2(react@18.2.0)
'@types/react-transition-group':
specifier: ^4.4.6
version: 4.4.6
@@ -4330,7 +4333,6 @@ packages:
'@react-types/progress': 3.4.3(react@18.2.0)
'@react-types/shared': 3.20.0(react@18.2.0)
react: 18.2.0
- dev: false
/@react-types/overlays@3.8.2(react@18.2.0):
resolution: {integrity: sha512-HpLYzkNvuvC6nKd06vF9XbcLLv3u55+e7YUFNVpgWq8yVxcnduOcJdRJhPaAqHUl6iVii04mu1GKnCFF8jROyQ==}
@@ -4348,7 +4350,6 @@ packages:
dependencies:
'@react-types/shared': 3.20.0(react@18.2.0)
react: 18.2.0
- dev: false
/@react-types/radio@3.5.1(react@18.2.0):
resolution: {integrity: sha512-jPF8zt+XdgW9DaTvB5ZYCh0uk7DVko1VZ/jOlCRs82w3P884Wc7MMpwdl1T5PBdhtLcdr+xjM1YI6/31reIBfQ==}
@@ -4411,7 +4412,6 @@ packages:
dependencies:
'@react-types/shared': 3.20.0(react@18.2.0)
react: 18.2.0
- dev: false
/@react-types/textfield@3.8.0(react@18.2.0):
resolution: {integrity: sha512-KRIEiIaB7pi0VlyOXNv39qeY0nBVmaXHwReCmEktQxKtXQ5lbEU6pvbc6srMZIplJffutQCZSXAucw/2ewLLVQ==}