fix button style

glassonion1 · Oct 26, 2023 · b3a1361 · b3a1361
1 parent f2a4791
commit b3a1361
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 12 deletions.
diff --git a/examples/package.json b/examples/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@sakura-ui/config": "^0.1.5",
-    "@sakura-ui/core": "^0.1.18",
+    "@sakura-ui/config": "workspace:^",
+    "@sakura-ui/core": "^0.1.20",
     "@sakura-ui/forms": "^0.1.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/examples/src/App.tsx b/examples/src/App.tsx
@@ -19,8 +19,8 @@ import {
   Faq,
   Question,
   Answer
-} from '../../packages/core/src'
-// from '@sakura-ui/core'
+} from '@sakura-ui/core'
+//from '../../packages/core/src'
 import {
   Checkbox,
   CheckboxGroup,

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sakura-ui/config",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "exports": {

diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
@@ -158,7 +158,7 @@ const sakuraPlugin = plugin(
           'button-sm': [
             '14px',
             {
-              lineHeight: '100%',
+              lineHeight: '14px',
               letterSpacing: '0.04em',
               fontWeight: '700'
             }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sakura-ui/core",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "type": "module",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",

diff --git a/packages/core/src/components/Link.tsx b/packages/core/src/components/Link.tsx
@@ -36,6 +36,16 @@ export const Link = React.forwardRef<HTMLAnchorElement, LinkProps>(
       antialiased
     `
 
+    const getLabel = () => {
+      const language =
+        (window.navigator.languages && window.navigator.languages[0]) ||
+        window.navigator.language
+      if (language === 'ja') {
+        return '新規タブで開きます'
+      }
+      return 'Opens in new tab'
+    }
+
     if (href.startsWith('http')) {
       return (
         <a
@@ -47,7 +57,7 @@ export const Link = React.forwardRef<HTMLAnchorElement, LinkProps>(
           ref={ref}
         >
           <span className={styleUnderLine}>{children}</span>
-          <span className={cx(styleIcon)} aria-label="新規タブで開きます">
+          <span className={cx(styleIcon)} aria-label={getLabel()}>
             open_in_new
           </span>
         </a>

diff --git a/packages/core/src/components/buttonStyle.ts b/packages/core/src/components/buttonStyle.ts
@@ -4,7 +4,6 @@ export const base = `
   inline-block
   text-button
   text-center
-  rounded-lg
   cursor-pointer
   whitespace-nowrap
   outline-offset-2
@@ -57,28 +56,32 @@ const params: {
     py-4
     my-0
     text-button
+    rounded-lg
   `,
   md: `
     h-[48px]
     px-4
     py-3
     my-0
     text-button
+    rounded-lg
   `,
   sm: `
     h-[36px]
     px-3
     py-1.5
     my-1
     text-button
+    rounded-md
   `,
   xs: `
     h-[28px]
     px-2
     py-[7px]
     my-2
-    text-[14px]
-    leading-[14px]
+    text-button-sm
+    !leading-[14px]
+    rounded
   `
 }
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml