From f1eed4185027bf5613a242b2b9ea7b33dc247308 Mon Sep 17 00:00:00 2001 From: Hideaki Takahashi Date: Wed, 6 Dec 2023 22:05:38 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20theme=E3=81=A7=E5=AE=9A?= =?UTF-8?q?=E7=BE=A9=E3=81=97=E3=81=A6=E3=81=84=E3=82=8Bline-height?= =?UTF-8?q?=E3=81=AE=E5=80=A4=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=A8=E3=80=81?= =?UTF-8?q?=E3=81=9D=E3=82=8C=E3=81=AB=E4=BC=B4=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/Heading/styles.css.ts | 2 +- src/components/base/Text/styles.css.ts | 2 +- src/components/base/Textarea/styles.css.ts | 2 +- src/components/common/Accordion/styles.css.ts | 2 +- src/styles/themes.css.ts | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/base/Heading/styles.css.ts b/src/components/base/Heading/styles.css.ts index 5e3637fe..ca02c40a 100644 --- a/src/components/base/Heading/styles.css.ts +++ b/src/components/base/Heading/styles.css.ts @@ -2,7 +2,7 @@ import { sprinkles } from '@/styles/sprinkles.css'; const styles = { common: sprinkles({ - lineHeight: 'heading', + lineHeight: 1.3, fontWeight: 'bold', color: 'black', }), diff --git a/src/components/base/Text/styles.css.ts b/src/components/base/Text/styles.css.ts index 37f59278..449e0a78 100644 --- a/src/components/base/Text/styles.css.ts +++ b/src/components/base/Text/styles.css.ts @@ -53,7 +53,7 @@ const fontStyle: { [Key in TextFontStyle]: string } = { const styles = recipe({ base: sprinkles({ - lineHeight: 'text', + lineHeight: 1.8, fontSize: { mobile: 14, desktop: 16, diff --git a/src/components/base/Textarea/styles.css.ts b/src/components/base/Textarea/styles.css.ts index 2bc7b0b2..953649e7 100644 --- a/src/components/base/Textarea/styles.css.ts +++ b/src/components/base/Textarea/styles.css.ts @@ -14,7 +14,7 @@ const styles = { desktop: 16, mobile: 14, }, - lineHeight: 'text', + lineHeight: 1.8, color: 'black', paddingX: 1, paddingY: 1.25, diff --git a/src/components/common/Accordion/styles.css.ts b/src/components/common/Accordion/styles.css.ts index e8b9d916..7e529dd3 100644 --- a/src/components/common/Accordion/styles.css.ts +++ b/src/components/common/Accordion/styles.css.ts @@ -19,9 +19,9 @@ const styles = { outlineColor: { focusVisible: 'blue', }, + lineHeight: 1, }), style({ - lineHeight: 'normal', backgroundColor: 'transparent', cursor: 'pointer', padding: 0, diff --git a/src/styles/themes.css.ts b/src/styles/themes.css.ts index d932790a..61cce0f8 100644 --- a/src/styles/themes.css.ts +++ b/src/styles/themes.css.ts @@ -55,8 +55,9 @@ export const fontSize = { } as const; export const lineHeight = { - text: '1.8', - heading: '1.3', + 1: '1', + 1.3: '1.3', + 1.8: '1.8', } as const; /**