From 1e8ac286b5dd4964ef4b7a3d74f5bcc0d3e25836 Mon Sep 17 00:00:00 2001 From: Francis Thibault <francis.thibault@gmail.com> Date: Wed, 27 Sep 2023 11:26:42 -0400 Subject: [PATCH 1/3] fix for issue 54 / 57 --- apps/docs/datas/tokens-dark.json | 10 ++-- apps/docs/datas/tokens.json | 52 +++++++++---------- .../tokens/src/tokens/core/fonts.tokens.json | 10 ++-- .../tokens/semantic/light/fonts.tokens.json | 10 ++-- 4 files changed, 35 insertions(+), 47 deletions(-) diff --git a/apps/docs/datas/tokens-dark.json b/apps/docs/datas/tokens-dark.json index 5c98cd7d9..38177df87 100644 --- a/apps/docs/datas/tokens-dark.json +++ b/apps/docs/datas/tokens-dark.json @@ -653,7 +653,7 @@ }, { "name": "hop-line-height-1-14", - "value": "1.14" + "value": "1.1428571" }, { "name": "hop-line-height-1-20", @@ -665,15 +665,11 @@ }, { "name": "hop-line-height-1-33", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-line-height-1-4285", - "value": "1.4285" - }, - { - "name": "hop-line-height-1-4295", - "value": "1.4295" + "value": "1.4285714" }, { "name": "hop-line-height-1-50", diff --git a/apps/docs/datas/tokens.json b/apps/docs/datas/tokens.json index 861b08ea5..adf39ba93 100644 --- a/apps/docs/datas/tokens.json +++ b/apps/docs/datas/tokens.json @@ -653,7 +653,7 @@ }, { "name": "hop-line-height-1-14", - "value": "1.14" + "value": "1.1428571" }, { "name": "hop-line-height-1-20", @@ -665,15 +665,11 @@ }, { "name": "hop-line-height-1-33", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-line-height-1-4285", - "value": "1.4285" - }, - { - "name": "hop-line-height-1-4295", - "value": "1.4295" + "value": "1.4285714" }, { "name": "hop-line-height-1-50", @@ -1989,7 +1985,7 @@ "lineHeight": [ { "name": "hop-heading-3xl-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-heading-2xl-line-height", @@ -1997,11 +1993,11 @@ }, { "name": "hop-heading-xl-line-height", - "value": "1.14" + "value": "1.1428571" }, { "name": "hop-heading-lg-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-heading-md-line-height", @@ -2021,7 +2017,7 @@ }, { "name": "hop-overline-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-2xl-line-height", @@ -2029,27 +2025,27 @@ }, { "name": "hop-body-xl-line-height", - "value": "1.14" + "value": "1.1428571" }, { "name": "hop-body-lg-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-lg-medium-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-lg-semibold-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-lg-bold-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-lg-underline-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-md-line-height", @@ -2073,43 +2069,43 @@ }, { "name": "hop-body-sm-line-height", - "value": "1.4285" + "value": "1.4285714" }, { "name": "hop-body-sm-medium-line-height", - "value": "1.4295" + "value": "1.4285714" }, { "name": "hop-body-sm-semibold-line-height", - "value": "1.4295" + "value": "1.4285714" }, { "name": "hop-body-sm-bold-line-height", - "value": "1.4295" + "value": "1.4285714" }, { "name": "hop-body-sm-underline-line-height", - "value": "1.4295" + "value": "1.4285714" }, { "name": "hop-body-xs-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-xs-medium-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-xs-semibold-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-xs-bold-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-body-xs-underline-line-height", - "value": "1.33" + "value": "1.3333333" }, { "name": "hop-accent-lg-line-height", @@ -2117,7 +2113,7 @@ }, { "name": "hop-accent-sm-line-height", - "value": "1.33" + "value": "1.3333333" } ], "borderRadius": [ diff --git a/packages/tokens/src/tokens/core/fonts.tokens.json b/packages/tokens/src/tokens/core/fonts.tokens.json index e59e8c950..be16b563e 100644 --- a/packages/tokens/src/tokens/core/fonts.tokens.json +++ b/packages/tokens/src/tokens/core/fonts.tokens.json @@ -94,7 +94,7 @@ }, "1-14": { "$type": "lineHeight", - "$value": "1.14" + "$value": "1.1428571" }, "1-20": { "$type": "lineHeight", @@ -106,15 +106,11 @@ }, "1-33": { "$type": "lineHeight", - "$value": "1.33" + "$value": "1.3333333" }, "1-4285": { "$type": "lineHeight", - "$value": "1.4285" - }, - "1-4295": { - "$type": "lineHeight", - "$value": "1.4295" + "$value": "1.4285714" }, "1-50": { "$type": "lineHeight", diff --git a/packages/tokens/src/tokens/semantic/light/fonts.tokens.json b/packages/tokens/src/tokens/semantic/light/fonts.tokens.json index 726d0ced6..4856b16ea 100644 --- a/packages/tokens/src/tokens/semantic/light/fonts.tokens.json +++ b/packages/tokens/src/tokens/semantic/light/fonts.tokens.json @@ -412,7 +412,7 @@ }, "line-height": { "$type": "lineHeight", - "$value": "{line-height.1-4295}" + "$value": "{line-height.1-4285}" } }, "semibold": { @@ -430,7 +430,7 @@ }, "line-height": { "$type": "lineHeight", - "$value": "{line-height.1-4295}" + "$value": "{line-height.1-4285}" } }, "bold": { @@ -448,7 +448,7 @@ }, "line-height": { "$type": "lineHeight", - "$value": "{line-height.1-4295}" + "$value": "{line-height.1-4285}" } }, "underline": { @@ -465,8 +465,8 @@ "$value": "{font.weight.505}" }, "line-height": { - "$type": "lineHeight", - "$value": "{line-height.1-4295}" + "$type": "lineHeight", + "$value": "{line-height.1-4285}" } } }, From f79aec5435759ae781da242edde659919aba9eac Mon Sep 17 00:00:00 2001 From: Francis Thibault <francis.thibault@gmail.com> Date: Wed, 27 Sep 2023 12:03:27 -0400 Subject: [PATCH 2/3] linting error --- apps/docs/components/ui/sectionPopover/sectionPopover.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/docs/components/ui/sectionPopover/sectionPopover.tsx b/apps/docs/components/ui/sectionPopover/sectionPopover.tsx index c2969fcac..7954e6ea6 100644 --- a/apps/docs/components/ui/sectionPopover/sectionPopover.tsx +++ b/apps/docs/components/ui/sectionPopover/sectionPopover.tsx @@ -48,7 +48,7 @@ const SectionPopover = ({ links }: React.PropsWithoutRef<SectionPopoverProps>) = <div className="hd-section-popover"> <Button className={cx("hd-section-popover__button", isOpen && "hd-section-popover__button--open")} onPress={togglePopover}> On this page - <ChevronIcon className="hd-section-popover__button-icon"/> + <ChevronIcon className="hd-section-popover__button-icon" /> </Button> <div className={cx("hd-section-popover__popover", isOpen && "hd-section-popover__popover--open")}> <a className="hd-section-popover__top-section" href="#top" onClick={togglePopover}>Return to top</a> From 874270eb67c911c73cac20cbe88271c81ec0cc77 Mon Sep 17 00:00:00 2001 From: Francis Thibault <francis.thibault@gmail.com> Date: Wed, 27 Sep 2023 14:13:57 -0400 Subject: [PATCH 3/3] changeset --- .changeset/wise-apes-rescue.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/wise-apes-rescue.md diff --git a/.changeset/wise-apes-rescue.md b/.changeset/wise-apes-rescue.md new file mode 100644 index 000000000..554965137 --- /dev/null +++ b/.changeset/wise-apes-rescue.md @@ -0,0 +1,6 @@ +--- +"@hopper-ui/tokens": major +"docs": patch +--- + +Removed unnecessary line-height / fix rounding for some line height tokens