diff --git a/package.json b/package.json
index abf4888..ca9994a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"devDependencies": {
"dotenv": "^16.3.1",
"@commitlint/cli": "^18.4.4",
- "eleganceui-tailwind-utilities": "^3.0.0",
+ "eleganceui-tailwind-utilities": "^3.1.1",
"@commitlint/config-conventional": "^18.4.4",
"@playwright/test": "^1.41.0",
"@testing-library/dom": "^9.3.4",
diff --git a/src/app/(home)/components/FooterCustomerOrderModal/Skeleton.tsx b/src/app/(home)/components/FooterCustomerOrderModal/Skeleton.tsx
index 21b27c2..0cfe7d2 100644
--- a/src/app/(home)/components/FooterCustomerOrderModal/Skeleton.tsx
+++ b/src/app/(home)/components/FooterCustomerOrderModal/Skeleton.tsx
@@ -2,7 +2,7 @@ import { Skeleton } from 'components/atoms'
export const SkeletonFooterCustomerOrderModal = () => (
-
-
+
+
)
diff --git a/src/theme/components/underlined-title.css b/src/theme/components/underlined-title.css
index d5154cd..08dff89 100644
--- a/src/theme/components/underlined-title.css
+++ b/src/theme/components/underlined-title.css
@@ -1,5 +1,5 @@
@layer components {
.underlined-title {
- @apply fs-20 font-700 max-w-fit uppercase after-base tx-primary-500 after:mt-8 after:h-4 after:w-[30%] after:bg-secondary-500 after:br;
+ @apply fs-xl-bold-primary-500 max-w-fit uppercase after-base after:mt-2 after:h-1 after:w-[30%] after:bg-secondary-500 after:br;
}
}
diff --git a/src/theme/reset.css b/src/theme/reset.css
index 2c77626..2f833b3 100644
--- a/src/theme/reset.css
+++ b/src/theme/reset.css
@@ -90,7 +90,7 @@
}
::-webkit-scrollbar-thumb {
- @apply br-5 bw-soft-white-blue bg-grey-light-500;
+ @apply br-[20px] bw bc-soft-white-blue bg-grey-light-500;
}
:root {
diff --git a/src/theme/variables/borderRadius.ts b/src/theme/variables/borderRadius.ts
deleted file mode 100644
index 27b7227..0000000
--- a/src/theme/variables/borderRadius.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const borderRadius = {
- 0: '0',
- 4: '4px',
- 8: '8px',
- 12: '12px',
- 16: '16px',
- 20: '20px',
- 32: '32px',
- 60: '60px',
- circle: '50%'
-}
diff --git a/src/theme/variables/fontWeights.ts b/src/theme/variables/fontWeights.ts
deleted file mode 100644
index dfdc286..0000000
--- a/src/theme/variables/fontWeights.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const fontWeights = {
- bold: '700',
- semibold: '600',
- medium: '500'
-}
diff --git a/src/theme/variables/index.ts b/src/theme/variables/index.ts
index 816ea46..ba48d8d 100644
--- a/src/theme/variables/index.ts
+++ b/src/theme/variables/index.ts
@@ -2,5 +2,3 @@ export { colors } from './colors'
export { zIndex } from './zIndex'
export { boxShadows } from './boxShadows'
export { keyframes } from './keyframes'
-export { fontWeights } from './fontWeights'
-export { borderRadius } from './borderRadius'
diff --git a/tailwind.config.ts b/tailwind.config.ts
index cf52a4d..ce9e8fa 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -6,9 +6,7 @@ import {
boxShadows,
colors,
keyframes,
- zIndex,
- fontWeights,
- borderRadius,
+ zIndex
} from './src/theme/variables'
const config: Config = {
@@ -19,9 +17,7 @@ const config: Config = {
theme: {
extend: {
colors,
- zIndex,
- fontWeights,
- borderRadius,
+ zIndex: { ...defaultTheme.zIndex, ...zIndex },
boxShadow: { ...defaultTheme.boxShadow, ...boxShadows },
keyframes: { ...defaultTheme.keyframes, ...keyframes },
fontFamily: {
diff --git a/yarn.lock b/yarn.lock
index 30b0e8f..b012389 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3687,10 +3687,10 @@ electron-to-chromium@^1.4.668:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.673.tgz#1f077d9a095761804aec7ec6346c3f4b69b56534"
integrity sha512-zjqzx4N7xGdl5468G+vcgzDhaHkaYgVcf9MqgexcTqsl2UHSCmOj/Bi3HAprg4BZCpC7HyD8a6nZl6QAZf72gw==
-eleganceui-tailwind-utilities@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/eleganceui-tailwind-utilities/-/eleganceui-tailwind-utilities-3.0.0.tgz#0abea7ebc2c06bd1ab0d9a600fe945528bddaee2"
- integrity sha512-/M7jpzj5WB+rjK7IIpTkEDtE4gxwQgAUuFJNJ+roJJtt1HUvIM6FLVdHipDGZSulNjmEfY/F7RcV2Ne5+SQc1w==
+eleganceui-tailwind-utilities@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/eleganceui-tailwind-utilities/-/eleganceui-tailwind-utilities-3.1.1.tgz#e675193ad493ce2d6003054b45faaf708dbb3e55"
+ integrity sha512-rrSnMEDgP1ebXxmsCLX0Ibpm0RlaM5gfq8/QHfuqatRcGSJSQl7hOS4+I8VI6TixPiiFfW0jnC6Wxh9w74kFdA==
emoji-regex@^10.3.0:
version "10.3.0"