From 481a5ba5b3bc81d6e6b8f34f5c07244f3a577bfc Mon Sep 17 00:00:00 2001 From: Dario Date: Sat, 17 Feb 2024 22:38:25 +0100 Subject: [PATCH 01/18] implement new type (Variant) and variant array --- src/utils/utils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 961b1d02..fc46f76e 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,5 +1,9 @@ import React, {ReactNode, useEffect, useMemo, useState} from "react"; +export type Variant = "primary" | "secondary" | "info" | "success" | "warning" | "error"; + +export const Variants: Variant[] = ["primary", "secondary", "info", "success", "warning", "error"] + export const getChild = (children: ReactNode | ReactNode[], child: React.FC, required?: boolean): React.ReactElement | undefined => { const [childComponent, setChildComponent] = useState() From 21c39af9cbd7c65d0c604431b6c877201cd02170 Mon Sep 17 00:00:00 2001 From: Dario Date: Sat, 17 Feb 2024 22:38:35 +0100 Subject: [PATCH 02/18] fix all hardcoded variants --- src/components/alert/Alert.stories.tsx | 7 +++---- src/components/alert/Alert.tsx | 5 +++-- src/components/badge/Badge.stories.tsx | 4 ++-- src/components/badge/Badge.tsx | 3 ++- src/components/button/Button.stories.tsx | 13 +++++-------- src/components/button/Button.tsx | 4 ++-- src/components/card/Card.tsx | 3 ++- src/components/menu/Menu.tsx | 4 ++-- 8 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/components/alert/Alert.stories.tsx b/src/components/alert/Alert.stories.tsx index d1001323..1df9b068 100644 --- a/src/components/alert/Alert.stories.tsx +++ b/src/components/alert/Alert.stories.tsx @@ -1,6 +1,7 @@ import React from "react"; import Alert from "./Alert"; import {Meta, StoryObj} from "@storybook/react"; +import {Variants} from "../../utils/utils"; const meta: Meta = { title: "Alert", @@ -28,8 +29,7 @@ export const WithBody: Story = { return <> { - ["primary", "secondary", "info", "success", "warning", "error"].map(value => { - // @ts-ignore + Variants.map(value => { return window.alert("closed")} dismissible={dismissible} icon={icon} title={value}> Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam @@ -51,8 +51,7 @@ export const WithoutBody: Story = { return <> { - ["primary", "secondary", "info", "success", "warning", "error"].map(value => { - // @ts-ignore + Variants.map(value => { return window.alert("closed")} dismissible={dismissible} icon={icon} title={value}/> }) } diff --git a/src/components/alert/Alert.tsx b/src/components/alert/Alert.tsx index ae25adce..5b4b0b2f 100644 --- a/src/components/alert/Alert.tsx +++ b/src/components/alert/Alert.tsx @@ -1,13 +1,14 @@ import React, {ReactElement, ReactNode} from "react"; import {IconAlertCircle, IconCircleCheck, IconCircleX, IconInfoCircle, IconX} from "@tabler/icons-react"; import "./Alert.style.scss" +import {Variant} from "../../utils/utils"; export interface AlertType { children?: ReactNode | ReactNode[] title: ReactNode //defaults to primary - variant?: "primary" | "secondary" | "info" | "success" | "warning" | "error" + variant?: Variant //defaults to true icon?: boolean //defaults to false @@ -50,7 +51,7 @@ export interface AlertHeadingType { } export interface AlertIconType { - variant: "primary" | "secondary" | "info" | "success" | "warning" | "error" + variant: Variant } const AlertIcon: React.FC = ({variant}) => { diff --git a/src/components/badge/Badge.stories.tsx b/src/components/badge/Badge.stories.tsx index 60889e9d..1a7e2059 100644 --- a/src/components/badge/Badge.stories.tsx +++ b/src/components/badge/Badge.stories.tsx @@ -3,6 +3,7 @@ import React from "react"; import Badge from "./Badge"; import Button from "../button/Button"; import {IconGitBranch} from "@tabler/icons-react"; +import {Variants as BadgeVariants} from "../../utils/utils"; const meta: Meta = { title: "Badge", @@ -13,8 +14,7 @@ export const Variants = () => { return <> { - ["primary", "secondary", "info", "success", "warning", "error"].map(value => { - // @ts-ignore + BadgeVariants.map(value => { return {value} diff --git a/src/components/badge/Badge.tsx b/src/components/badge/Badge.tsx index bb2d04c2..5d63613a 100644 --- a/src/components/badge/Badge.tsx +++ b/src/components/badge/Badge.tsx @@ -1,10 +1,11 @@ import React, {HTMLProps} from "react"; import "./Badge.style.scss" +import {Variant} from "../../utils/utils"; export interface BadgeType extends HTMLProps{ children: string //defaults to primary - variant?: "primary" | "secondary" | "info" | "success" | "warning" | "error" + variant?: Variant } const Badge: React.FC = (props) => { diff --git a/src/components/button/Button.stories.tsx b/src/components/button/Button.stories.tsx index 47a5ec6e..4b4bbd17 100644 --- a/src/components/button/Button.stories.tsx +++ b/src/components/button/Button.stories.tsx @@ -3,6 +3,7 @@ import {StoryObj} from "@storybook/react"; import React from "react"; import ButtonGroup from "../button-group/ButtonGroup"; import {IconAbc} from "@tabler/icons-react"; +import {Variants} from "../../utils/utils"; const meta = { title: "Button", @@ -32,8 +33,7 @@ export const Buttons: ButtonStory = { return <> { - ["primary", "secondary", "info", "success", "warning", "error"].map(value => { - // @ts-ignore + Variants.map(value => { return diff --git a/src/components/badge/Badge.tsx b/src/components/badge/Badge.tsx index 5d63613a..725369cd 100644 --- a/src/components/badge/Badge.tsx +++ b/src/components/badge/Badge.tsx @@ -1,18 +1,18 @@ import React, {HTMLProps} from "react"; import "./Badge.style.scss" -import {Variant} from "../../utils/utils"; +import {Color} from "../../utils/utils"; export interface BadgeType extends HTMLProps{ children: string //defaults to primary - variant?: Variant + color?: Color } const Badge: React.FC = (props) => { - const {variant = "primary", children, ...args} = props + const {color = "primary", children, ...args} = props - return + return {children} } diff --git a/src/components/button/Button.stories.tsx b/src/components/button/Button.stories.tsx index 60b98385..a8b7a60e 100644 --- a/src/components/button/Button.stories.tsx +++ b/src/components/button/Button.stories.tsx @@ -3,7 +3,7 @@ import {StoryObj} from "@storybook/react"; import React from "react"; import ButtonGroup from "../button-group/ButtonGroup"; import {IconAbc} from "@tabler/icons-react"; -import {Variants} from "../../utils/utils"; +import {Colors} from "../../utils/utils"; const meta = { title: "Button", @@ -33,8 +33,8 @@ export const Buttons: ButtonStory = { return <> { - Variants.map(value => { - return @@ -53,8 +53,8 @@ export const ButtonGroups: ButtonGroupStory = { return <> { - Variants.map((value, index) => { - return @@ -65,7 +65,7 @@ export const ButtonGroups: ButtonGroupStory = { { ["primary", "primary", "primary", "primary"].map((value, index) => { // @ts-ignore - return @@ -77,7 +77,7 @@ export const ButtonGroups: ButtonGroupStory = { { ["secondary", "secondary", "secondary", "secondary"].map((value, index) => { // @ts-ignore - return diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx index a2b85582..6717b10c 100644 --- a/src/components/button/Button.tsx +++ b/src/components/button/Button.tsx @@ -4,12 +4,12 @@ import React, { DetailedHTMLProps, ReactNode } from "react"; -import {getChild, getContent, Variant} from "../../utils/utils"; +import {getChild, getContent, Color} from "../../utils/utils"; export interface ButtonType extends DetailedHTMLProps, HTMLAnchorElement> { children: ReactNode | ReactNode[] //defaults to primary - variant?: Variant, + color?: Color, //defaults to false active?: boolean //defaults to false @@ -22,12 +22,12 @@ export interface ButtonIconType { const Button: React.FC = (props) => { - const {children, variant = "primary", active = false, disabled = false, ...args} = props + const {children, color = "primary", active = false, disabled = false, ...args} = props const icon = getChild(children, ButtonIcon) const content = getContent(children, ButtonIcon) - return {icon} {content ? {content} : null} diff --git a/src/components/card/Card.stories.tsx b/src/components/card/Card.stories.tsx index d016053a..a7256db2 100644 --- a/src/components/card/Card.stories.tsx +++ b/src/components/card/Card.stories.tsx @@ -15,7 +15,7 @@ const meta: Meta = { export default meta export const Test = () => { - return + return Nico Sammito @@ -39,10 +39,10 @@ export const Test = () => { - - diff --git a/src/components/card/Card.tsx b/src/components/card/Card.tsx index 1f31da1d..246f0c18 100644 --- a/src/components/card/Card.tsx +++ b/src/components/card/Card.tsx @@ -5,21 +5,21 @@ import {CardHeader, CardHeaderType} from "./CardHeader"; import {CardTitle, CardTitleType} from "./CardTitle"; import {CardSubTitle, CardSubTitleType} from "./CardSubTitle"; import {CardFooter, CardFooterType} from "./CardFooter"; -import {Variant} from "../../utils/utils"; +import {Color} from "../../utils/utils"; export type CardChildType = CardHeaderType | CardImgStyle | CardTitleType | CardSubTitleType | CardFooterType | any export interface CardType { children: ReactElement | ReactElement[] //defaults to secondary - variant?: Variant + color?: Color } const Card: React.FC = (props) => { - const {children, variant = "secondary", ...args} = props + const {children, color = "secondary", ...args} = props - return
+ return
{children}
} diff --git a/src/components/dropdown/Dropdown.stories.tsx b/src/components/dropdown/Dropdown.stories.tsx index f5e01d0e..974d8b87 100644 --- a/src/components/dropdown/Dropdown.stories.tsx +++ b/src/components/dropdown/Dropdown.stories.tsx @@ -53,12 +53,12 @@ export const Dropdowns = () => { { ["secondary", "secondary", "secondary", "secondary"].map((value, index) => { // @ts-ignore - return (index % 2 == 0) ? : - diff --git a/src/components/menu/InternalMenu.tsx b/src/components/menu/InternalMenu.tsx index da9138ae..3ac128fa 100644 --- a/src/components/menu/InternalMenu.tsx +++ b/src/components/menu/InternalMenu.tsx @@ -37,7 +37,7 @@ export function InternalMenu(props: AriaMenuProps) { function InternalMenuItem({item, state}: {item: Node, state: TreeState}) { - const {variant = "secondary", disabled = false, unselectable = false} = item.props as MenuItemType + const {color = "secondary", disabled = false, unselectable = false} = item.props as MenuItemType // Get props for the menu item element const ref = React.useRef(null); @@ -48,7 +48,7 @@ function InternalMenuItem({item, state}: {item: Node, state: TreeState} ) return ( -
  • +
  • {item.rendered}
    {isSelected && !unselectable ? : menuItemProps.role != "menuitem" ? : null} diff --git a/src/components/menu/Menu.tsx b/src/components/menu/Menu.tsx index a7db0568..98124c02 100644 --- a/src/components/menu/Menu.tsx +++ b/src/components/menu/Menu.tsx @@ -1,5 +1,5 @@ import React from "react"; -import {getChild, Variant} from "../../utils/utils"; +import {getChild, Color} from "../../utils/utils"; import {PopoverProps} from "../popover/Popover"; import {AriaMenuProps, Key, useButton, useMenuTrigger} from "react-aria"; import {Item, Section, useMenuTriggerState} from "react-stately"; @@ -24,7 +24,7 @@ export interface MenuContentType { export interface MenuItemType { children: React.ReactNode key: Key - variant?: Variant + color?: Color disabled?: boolean unselectable?: boolean textValue?: string diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 901dc56b..e86c824d 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,8 +1,8 @@ import React, {ReactNode, useEffect, useMemo, useState} from "react"; -export type Variant = "primary" | "secondary" | "info" | "success" | "warning" | "error"; +export type Color = "primary" | "secondary" | "info" | "success" | "warning" | "error"; -export const Variants: Variant[] = ["primary", "secondary", "info", "success", "warning", "error"] +export const Colors: Color[] = ["primary", "secondary", "info", "success", "warning", "error"] export type Size = "xs" | "sm" | "md" | "lg" | "xl"; From 42fcd6bf6f7c4a199637baca83c58a19ae30b7d6 Mon Sep 17 00:00:00 2001 From: Dario Date: Sun, 18 Feb 2024 16:17:20 +0100 Subject: [PATCH 06/18] add new variables --- src/styles/_helpers.scss | 4 ++-- src/styles/_variables.scss | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/styles/_helpers.scss b/src/styles/_helpers.scss index c0c5d6a0..c5326d15 100644 --- a/src/styles/_helpers.scss +++ b/src/styles/_helpers.scss @@ -8,7 +8,7 @@ border-radius: $borderRadius; color: rgba($white, .5); font-family: Ubuntu, sans-serif; - font-size: $secondaryFontSize; + font-size: map-get($md, "font"); position: relative; @if ($active == true) { @@ -24,7 +24,7 @@ border-radius: $borderRadius; color: rgba($white, .5); font-family: Ubuntu, sans-serif; - font-size: $secondaryFontSize; + font-size: map-get($md, "font"); position: relative; @if ($active == true) { diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 123c9d6e..4ae5ca81 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -1,4 +1,5 @@ $bodyBg: #030014; +//colors $primary: #030014; $secondary: #ffffff; $info: #70ffb2; @@ -8,11 +9,25 @@ $error: #D90429; $black: #000000; $white: #ffffff; +//(font-)sizes + +$xs: ("font": .75rem); +$sm: ("font": .8rem); +$md: ("font": 1rem); +$lg: ("font": 1.3rem); +$xl: ("font": 2rem); + +$sizes: ( + "xs": $xs, + "sm": $sm, + "md": $md, + "lg": $lg, + "xl": $xl, +); + + //component styling $borderRadius: .5rem; -$primaryFontSize: 1.25rem; -$secondaryFontSize: 1rem; -$tertiaryFontSize: .75rem; $variants: ( "primary": $primary, From 89b7c9422b4d1e70513df8b1fb5e10e37a42cd99 Mon Sep 17 00:00:00 2001 From: Dario Date: Sun, 18 Feb 2024 16:17:28 +0100 Subject: [PATCH 07/18] Implement variables --- src/components/badge/Badge.style.scss | 5 +++-- src/components/card/Card.style.scss | 4 ++-- src/components/menu/Menu.style.scss | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/badge/Badge.style.scss b/src/components/badge/Badge.style.scss index e875bf5c..43c1a713 100644 --- a/src/components/badge/Badge.style.scss +++ b/src/components/badge/Badge.style.scss @@ -1,17 +1,18 @@ @import "../../styles/helpers"; +@import "../../styles/variables"; .badge { @include opacityBox(false); padding: .25rem; display: inline-flex; - font-size: $tertiaryFontSize; + font-size: map-get($xs, "font"); width: fit-content; } @each $name, $color in $variants { .badge--#{$name} { @include opacityBox(false, $color); - font-size: $tertiaryFontSize; + font-size: map-get($xs, "font"); } } \ No newline at end of file diff --git a/src/components/card/Card.style.scss b/src/components/card/Card.style.scss index 77ee320b..094ba742 100644 --- a/src/components/card/Card.style.scss +++ b/src/components/card/Card.style.scss @@ -49,7 +49,7 @@ &__title { padding: 0; - font-size: $primaryFontSize; + font-size: map-get($lg, "font"); color: rgba($white, 1); font-weight: 500; margin: 0 0 .5rem; @@ -57,7 +57,7 @@ &__sub-title { padding: 0; - font-size: $secondaryFontSize; + font-size: map-get($md, "font"); color: rgba($white, .75); font-weight: 500; margin: 0 0 .5rem; diff --git a/src/components/menu/Menu.style.scss b/src/components/menu/Menu.style.scss index 4a55ad59..46ac548d 100644 --- a/src/components/menu/Menu.style.scss +++ b/src/components/menu/Menu.style.scss @@ -55,7 +55,7 @@ } &__section-title { - font-size: $tertiaryFontSize; + font-size: map-get($xs, "font"); color: rgba($white, .25); display: block; margin: .25rem 0 .25rem .25rem; From eacc30d6f7c1f55e2b6edcaed5e51030ab31f70b Mon Sep 17 00:00:00 2001 From: Dario Date: Sun, 18 Feb 2024 16:17:35 +0100 Subject: [PATCH 08/18] Display variables --- src/components/FontSizes/Font.stories.tsx | 24 +++++++++++++++++++++++ src/components/FontSizes/Font.style.scss | 8 ++++++++ src/components/FontSizes/Font.tsx | 18 +++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 src/components/FontSizes/Font.stories.tsx create mode 100644 src/components/FontSizes/Font.style.scss create mode 100644 src/components/FontSizes/Font.tsx diff --git a/src/components/FontSizes/Font.stories.tsx b/src/components/FontSizes/Font.stories.tsx new file mode 100644 index 00000000..d5429520 --- /dev/null +++ b/src/components/FontSizes/Font.stories.tsx @@ -0,0 +1,24 @@ +import Font from "./Font"; +import React from "react"; +import {Sizes} from "../../utils/utils"; +import {Button, ButtonGroup} from "../../index"; + + +export default { + title: "Font", + component: Font +}; + +export const Fonts = () => <> + { + + { + Sizes.map(value => + + ) + } + + } + \ No newline at end of file diff --git a/src/components/FontSizes/Font.style.scss b/src/components/FontSizes/Font.style.scss new file mode 100644 index 00000000..de54cfb8 --- /dev/null +++ b/src/components/FontSizes/Font.style.scss @@ -0,0 +1,8 @@ +@import "../../styles/variables"; + + +@each $name, $entry in $sizes { + .size__#{$name} { + font-size: map-get($entry, "font"); + } +} \ No newline at end of file diff --git a/src/components/FontSizes/Font.tsx b/src/components/FontSizes/Font.tsx new file mode 100644 index 00000000..f1f9b9bc --- /dev/null +++ b/src/components/FontSizes/Font.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import {Size} from "../../utils/utils"; +import "./Font.style.scss" + +export interface FontType { + children: string, + size: Size, +} + +const Font: React.FC = (props) => { + const {size, children} = props; + + return + {children} + +} + +export default Font \ No newline at end of file From c8ddbc7d067b72afb0f1f8fca338ca9cdc616016 Mon Sep 17 00:00:00 2001 From: Dario Date: Sun, 18 Feb 2024 16:24:34 +0100 Subject: [PATCH 09/18] change large font --- src/styles/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 4ae5ca81..dd69684c 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -14,7 +14,7 @@ $white: #ffffff; $xs: ("font": .75rem); $sm: ("font": .8rem); $md: ("font": 1rem); -$lg: ("font": 1.3rem); +$lg: ("font": 1.25rem); $xl: ("font": 2rem); $sizes: ( From 9c4fa87ac93b065a7ea7088b9a4008589659d0a1 Mon Sep 17 00:00:00 2001 From: Dario Date: Mon, 19 Feb 2024 17:09:48 +0100 Subject: [PATCH 10/18] fix recommended changes --- src/components/FontSizes/Font.style.scss | 8 -------- src/components/FontSizes/Font.tsx | 18 ------------------ .../{Font.stories.tsx => Text.stories.tsx} | 8 ++++---- src/components/FontSizes/Text.style.scss | 8 ++++++++ src/components/FontSizes/Text.tsx | 17 +++++++++++++++++ src/components/alert/Alert.stories.tsx | 2 +- src/components/alert/Alert.tsx | 8 ++++---- src/components/badge/Badge.stories.tsx | 2 +- src/components/badge/Badge.style.scss | 4 ++-- src/components/button/Button.stories.tsx | 5 +++-- src/components/button/Button.tsx | 3 ++- src/components/card/Card.style.scss | 4 ++-- src/components/card/Card.tsx | 2 +- src/components/menu/Menu.stories.tsx | 6 +++--- src/components/menu/Menu.style.scss | 2 +- src/components/menu/Menu.tsx | 3 ++- src/styles/_helpers.scss | 4 ++-- src/styles/_variables.scss | 10 +++++----- src/utils/types.ts | 7 +++++++ src/utils/utils.ts | 8 -------- 20 files changed, 65 insertions(+), 64 deletions(-) delete mode 100644 src/components/FontSizes/Font.style.scss delete mode 100644 src/components/FontSizes/Font.tsx rename src/components/FontSizes/{Font.stories.tsx => Text.stories.tsx} (70%) create mode 100644 src/components/FontSizes/Text.style.scss create mode 100644 src/components/FontSizes/Text.tsx create mode 100644 src/utils/types.ts diff --git a/src/components/FontSizes/Font.style.scss b/src/components/FontSizes/Font.style.scss deleted file mode 100644 index de54cfb8..00000000 --- a/src/components/FontSizes/Font.style.scss +++ /dev/null @@ -1,8 +0,0 @@ -@import "../../styles/variables"; - - -@each $name, $entry in $sizes { - .size__#{$name} { - font-size: map-get($entry, "font"); - } -} \ No newline at end of file diff --git a/src/components/FontSizes/Font.tsx b/src/components/FontSizes/Font.tsx deleted file mode 100644 index f1f9b9bc..00000000 --- a/src/components/FontSizes/Font.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from "react"; -import {Size} from "../../utils/utils"; -import "./Font.style.scss" - -export interface FontType { - children: string, - size: Size, -} - -const Font: React.FC = (props) => { - const {size, children} = props; - - return - {children} - -} - -export default Font \ No newline at end of file diff --git a/src/components/FontSizes/Font.stories.tsx b/src/components/FontSizes/Text.stories.tsx similarity index 70% rename from src/components/FontSizes/Font.stories.tsx rename to src/components/FontSizes/Text.stories.tsx index d5429520..a996cbcd 100644 --- a/src/components/FontSizes/Font.stories.tsx +++ b/src/components/FontSizes/Text.stories.tsx @@ -1,12 +1,12 @@ -import Font from "./Font"; +import Text from "./Text"; import React from "react"; -import {Sizes} from "../../utils/utils"; +import {Sizes} from "../../utils/types"; import {Button, ButtonGroup} from "../../index"; export default { title: "Font", - component: Font + component: Text }; export const Fonts = () => <> @@ -15,7 +15,7 @@ export const Fonts = () => <> { Sizes.map(value => ) } diff --git a/src/components/FontSizes/Text.style.scss b/src/components/FontSizes/Text.style.scss new file mode 100644 index 00000000..c6cb1f64 --- /dev/null +++ b/src/components/FontSizes/Text.style.scss @@ -0,0 +1,8 @@ +@import "../../styles/variables"; + + +@each $name, $font in $sizes { + .size--#{$name} { + font-size: $font; + } +} \ No newline at end of file diff --git a/src/components/FontSizes/Text.tsx b/src/components/FontSizes/Text.tsx new file mode 100644 index 00000000..d938ab56 --- /dev/null +++ b/src/components/FontSizes/Text.tsx @@ -0,0 +1,17 @@ +import React from "react"; +import {Size} from "../../utils/types"; +import "./Font.style.scss" + +export interface FontType extends Omit, HTMLSpanElement>, "children">, "className"> { + children: string, + size: Size, +} + +const Text: React.FC = ({ size, children, ...rest }) => { + + return + {children} + +} + +export default Text \ No newline at end of file diff --git a/src/components/alert/Alert.stories.tsx b/src/components/alert/Alert.stories.tsx index 42040a3d..5862ee62 100644 --- a/src/components/alert/Alert.stories.tsx +++ b/src/components/alert/Alert.stories.tsx @@ -1,7 +1,7 @@ import React from "react"; import Alert from "./Alert"; import {Meta, StoryObj} from "@storybook/react"; -import {Colors} from "../../utils/utils"; +import {Colors} from "../../utils/types"; const meta: Meta = { title: "Alert", diff --git a/src/components/alert/Alert.tsx b/src/components/alert/Alert.tsx index 1aac3003..0d6e14c6 100644 --- a/src/components/alert/Alert.tsx +++ b/src/components/alert/Alert.tsx @@ -33,7 +33,7 @@ const Alert: React.FC = (props) => { return
    - {icon ? : null} + {icon ? : null} {title}
    {dismissible ? : null} @@ -51,12 +51,12 @@ export interface AlertHeadingType { } export interface AlertIconType { - variant: Color + color: Color } -const AlertIcon: React.FC = ({variant}) => { +const AlertIcon: React.FC = ({color}) => { return - {IconColors[variant]} + {IconColors[color]} } diff --git a/src/components/badge/Badge.stories.tsx b/src/components/badge/Badge.stories.tsx index 4a437dca..adfcebc3 100644 --- a/src/components/badge/Badge.stories.tsx +++ b/src/components/badge/Badge.stories.tsx @@ -3,7 +3,7 @@ import React from "react"; import Badge from "./Badge"; import Button from "../button/Button"; import {IconGitBranch} from "@tabler/icons-react"; -import {Colors as BadgeVariants} from "../../utils/utils"; +import {Colors as BadgeVariants} from "../../utils/types"; const meta: Meta = { title: "Badge", diff --git a/src/components/badge/Badge.style.scss b/src/components/badge/Badge.style.scss index 43c1a713..b9ea7eb5 100644 --- a/src/components/badge/Badge.style.scss +++ b/src/components/badge/Badge.style.scss @@ -6,13 +6,13 @@ padding: .25rem; display: inline-flex; - font-size: map-get($xs, "font"); + font-size: $xs; width: fit-content; } @each $name, $color in $variants { .badge--#{$name} { @include opacityBox(false, $color); - font-size: map-get($xs, "font"); + font-size: $xs; } } \ No newline at end of file diff --git a/src/components/button/Button.stories.tsx b/src/components/button/Button.stories.tsx index 5873c447..ce62ccb0 100644 --- a/src/components/button/Button.stories.tsx +++ b/src/components/button/Button.stories.tsx @@ -3,7 +3,7 @@ import {StoryObj} from "@storybook/react"; import React from "react"; import ButtonGroup from "../button-group/ButtonGroup"; import {IconAbc} from "@tabler/icons-react"; -import {Colors} from "../../utils/utils"; +import {Colors} from "../../utils/types"; const meta = { title: "Button", @@ -38,7 +38,8 @@ export const Buttons: ButtonStory = { return <> { Colors.map(value => { - return diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx index 6b8e14b8..fc3309a3 100644 --- a/src/components/button/Button.tsx +++ b/src/components/button/Button.tsx @@ -4,7 +4,8 @@ import React, { DetailedHTMLProps, ReactNode } from "react"; -import {getChild, getContent, Color} from "../../utils/utils"; +import {getChild, getContent} from "../../utils/utils"; +import {Color} from "../../utils/types" export interface ButtonType extends DetailedHTMLProps, HTMLAnchorElement> { children: ReactNode | ReactNode[] diff --git a/src/components/card/Card.style.scss b/src/components/card/Card.style.scss index 094ba742..f106379f 100644 --- a/src/components/card/Card.style.scss +++ b/src/components/card/Card.style.scss @@ -49,7 +49,7 @@ &__title { padding: 0; - font-size: map-get($lg, "font"); + font-size: $lg; color: rgba($white, 1); font-weight: 500; margin: 0 0 .5rem; @@ -57,7 +57,7 @@ &__sub-title { padding: 0; - font-size: map-get($md, "font"); + font-size: $md; color: rgba($white, .75); font-weight: 500; margin: 0 0 .5rem; diff --git a/src/components/card/Card.tsx b/src/components/card/Card.tsx index 246f0c18..2615b0a4 100644 --- a/src/components/card/Card.tsx +++ b/src/components/card/Card.tsx @@ -5,7 +5,7 @@ import {CardHeader, CardHeaderType} from "./CardHeader"; import {CardTitle, CardTitleType} from "./CardTitle"; import {CardSubTitle, CardSubTitleType} from "./CardSubTitle"; import {CardFooter, CardFooterType} from "./CardFooter"; -import {Color} from "../../utils/utils"; +import {Color} from "../../utils/types"; export type CardChildType = CardHeaderType | CardImgStyle | CardTitleType | CardSubTitleType | CardFooterType | any diff --git a/src/components/menu/Menu.stories.tsx b/src/components/menu/Menu.stories.tsx index 389ebb14..51f6bc6b 100644 --- a/src/components/menu/Menu.stories.tsx +++ b/src/components/menu/Menu.stories.tsx @@ -38,7 +38,7 @@ export const MenuAccount: MenuStory = { - + Storage almost full. You can
    manage your storage in Settings →
    @@ -46,11 +46,11 @@ export const MenuAccount: MenuStory = { Update Account - Delete Account - Logout ⌘Q
    diff --git a/src/components/menu/Menu.style.scss b/src/components/menu/Menu.style.scss index 46ac548d..041d1a51 100644 --- a/src/components/menu/Menu.style.scss +++ b/src/components/menu/Menu.style.scss @@ -55,7 +55,7 @@ } &__section-title { - font-size: map-get($xs, "font"); + font-size: $xs; color: rgba($white, .25); display: block; margin: .25rem 0 .25rem .25rem; diff --git a/src/components/menu/Menu.tsx b/src/components/menu/Menu.tsx index 98124c02..4d15c6d3 100644 --- a/src/components/menu/Menu.tsx +++ b/src/components/menu/Menu.tsx @@ -1,5 +1,5 @@ import React from "react"; -import {getChild, Color} from "../../utils/utils"; +import {getChild} from "../../utils/utils"; import {PopoverProps} from "../popover/Popover"; import {AriaMenuProps, Key, useButton, useMenuTrigger} from "react-aria"; import {Item, Section, useMenuTriggerState} from "react-stately"; @@ -8,6 +8,7 @@ import {InternalPopover} from "../popover/InternalPopover"; import {InternalMenu} from "./InternalMenu"; import Badge from "../badge/Badge"; import "./Menu.style.scss" +import {Color} from "../../utils/types"; export interface MenuType extends AriaMenuProps, PopoverProps { children: React.ReactElement[] diff --git a/src/styles/_helpers.scss b/src/styles/_helpers.scss index c5326d15..a1faa94e 100644 --- a/src/styles/_helpers.scss +++ b/src/styles/_helpers.scss @@ -8,7 +8,7 @@ border-radius: $borderRadius; color: rgba($white, .5); font-family: Ubuntu, sans-serif; - font-size: map-get($md, "font"); + font-size: $md; position: relative; @if ($active == true) { @@ -24,7 +24,7 @@ border-radius: $borderRadius; color: rgba($white, .5); font-family: Ubuntu, sans-serif; - font-size: map-get($md, "font"); + font-size: $md; position: relative; @if ($active == true) { diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index dd69684c..09b35827 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -11,11 +11,11 @@ $white: #ffffff; //(font-)sizes -$xs: ("font": .75rem); -$sm: ("font": .8rem); -$md: ("font": 1rem); -$lg: ("font": 1.25rem); -$xl: ("font": 2rem); +$xs: .75rem; +$sm: .8rem; +$md: 1rem; +$lg: 1.25rem; +$xl: 2rem; $sizes: ( "xs": $xs, diff --git a/src/utils/types.ts b/src/utils/types.ts new file mode 100644 index 00000000..f28ff856 --- /dev/null +++ b/src/utils/types.ts @@ -0,0 +1,7 @@ +export type Color = "primary" | "secondary" | "info" | "success" | "warning" | "error"; + +export const Colors: Color[] = ["primary", "secondary", "info", "success", "warning", "error"] + +export type Size = "xs" | "sm" | "md" | "lg" | "xl"; + +export const Sizes: Size[] = ["xs", "sm", "md", "lg", "xl"] \ No newline at end of file diff --git a/src/utils/utils.ts b/src/utils/utils.ts index e86c824d..ffbb7f92 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,13 +1,5 @@ import React, {ReactNode, useEffect, useMemo, useState} from "react"; -export type Color = "primary" | "secondary" | "info" | "success" | "warning" | "error"; - -export const Colors: Color[] = ["primary", "secondary", "info", "success", "warning", "error"] - -export type Size = "xs" | "sm" | "md" | "lg" | "xl"; - -export const Sizes: Size[] = ["xs", "sm", "md", "lg", "xl"] - export const getChild = (children: ReactNode | ReactNode[], child: React.FC, required?: boolean): React.ReactElement | undefined => { From 9437dca6281321c2ed1c0bbe37c9b907b9cfcea9 Mon Sep 17 00:00:00 2001 From: Dario Date: Mon, 19 Feb 2024 17:12:51 +0100 Subject: [PATCH 11/18] fix wrong import --- src/components/FontSizes/Text.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FontSizes/Text.tsx b/src/components/FontSizes/Text.tsx index d938ab56..d59a351b 100644 --- a/src/components/FontSizes/Text.tsx +++ b/src/components/FontSizes/Text.tsx @@ -1,6 +1,6 @@ import React from "react"; import {Size} from "../../utils/types"; -import "./Font.style.scss" +import "./Text.style.scss" export interface FontType extends Omit, HTMLSpanElement>, "children">, "className"> { children: string, From 615e033d50930eea5bb669096c0b72ceb21f8977 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 16:49:58 +0000 Subject: [PATCH 12/18] Update image snapshots --- __snapshots__/font--fonts-chromium.png | Bin 0 -> 3027 bytes __snapshots__/font--fonts-firefox.png | Bin 0 -> 3873 bytes __snapshots__/font--fonts-webkit.png | Bin 0 -> 2842 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 __snapshots__/font--fonts-chromium.png create mode 100644 __snapshots__/font--fonts-firefox.png create mode 100644 __snapshots__/font--fonts-webkit.png diff --git a/__snapshots__/font--fonts-chromium.png b/__snapshots__/font--fonts-chromium.png new file mode 100644 index 0000000000000000000000000000000000000000..3346e939931817bf84b05daf41a83f5404302858 GIT binary patch literal 3027 zcmbW3cQo5=8^@zoZM7P!UfLQpV(+4A6v0!Ys#cH~wMW%n)f$gcVpLRBQBSo-l~^%a zD)wwdBt|JpO06K~`+NU>&U4=Pyno#5oa@}@T;KcpUiT;U4+~>9W&vgp2*hS`$G{3$ zr-AYCA_FkbiIpIMg(k$xSRYg~BD4kqv1FJS+_DLOxiPyI!h>(YZvP$%9jz)hhdp`z zT>hd-JhUsnjuU411uVt|>979Q7;v5USe$C?Uy(x^@Q?`N(+V1ZSTVE><zOYktuJ;0>G82Neb!e-Q5cKna6%~lgb$wjF8OW%1omU z{`U1G=FBB|O%yy-In}kNzkk?c4x_Pmz~N>;RZe{DH!sV>>}Ibz?$w!OMnVcNJY(uoqY>1YxI5q3)`GAJ^pMJREz=X%gnyU~D zdH(hU3L~`AY1GYw&aY3%_beYveM+Q*rX!KaVNy%TTSTv)YL53&l#T0M8m-Ry3_Iu8 zjI*Czp#@8t=J@bUs%N2+1V{XBMvmRs-H%Kz4t1dl=hPwmcDObm-qs>ZXORL+{Ibvb z6<+q_zL62sref|#=$|*+4&Gkgnew0OJE7n8k1W<*Se4Gm`o0~0r@{*J(Q`hX>9S&C zD#Q)37CaRY{`};G>V+~A%YNOYW@_iDmdxHkj*OdiDw#N$yYx`ic4?RDMWTQqr$-#> z`{%WiM3H#p zKxQ!;Xc|5IYWBEJ*1=x*u}>J|5G{q`AXzK<_4h%@+JppVzY1iS> z2iEIm1Zpuyj8D!{PfTGT;gnG$u4Wb&%$zUR8)S8IXbf3UXV1&y{WVSKO6_dgE-E-n zLD*~WjcKk6q9+IhbIXHiwSyzJyl*iPN{ss=Ke{;}ob1WHG0695|5*VLkhtO|obbIA zjP{de1MB^6)L|FahQ@T?!#G1S+R!1(1Gb7vN)wNqsC!BkDx_*DmirNgQbiBnQ*jWN z-g=o1%0@tN`7-Sc5i-&2qh)AFUv4FJ7W_IDJ*8B$XYc4}0EBm*4!;L-=^Ge;>NWvo z{44fUR_Ev^7kR3>)RkCvvWC;093StWX

    K(2F`Y#CP(_4vJ}@=oSvQk>7l)^zkZ- zMnduV`AfjzO>?uPa2?9r_T}-G$jifHDG=8--DSBGWc`knoljfd@#T3&Js;MbdnJhU$W$Cp3cu?}pb>ZN+P&ZEQt@i|8Q1~EPOd-u(>!rHF{^yLZ zM)FAU>T1u63{Tdi+z?joF-Nosd$-XD?ksGo!50wR0|BVMws~gbC);$1J-N=WXnL!! z0jI}27wxW_Y9My{+#B_a&|Z+cw8)m|s9J#(I^GwCkH@e`*>|L$9&^x)jgOm1^0<+w z1QZp;(tAiz+)=Hyb;p#ZY0UDaj)T(x>-uOyQtc;MK_Ysb@{wj1ic-(K{jY_`)%gyE zKO=K8k)|R)ag>km2Q5|;=HZH|qpPW@ z|By_nA=5oc*!#A=(8Z~HPB7csbNv3UQZS-?#ntXuJFceqa_qLlT!2pRq|3aah5vq1 ztyzV~N)t?Z#!`mQ-TQlv)W*R)Z4Bih1cbojZOsd+swg}>G8X40+1a<2YOq~O)ri@t zT>7CU%GM9-49sqrQk=$EkF}-Rn_~*OO;2=YW+bqDSsid?^OUE@J%*MDjd1NNt*w!u zi8kkhbRMDUxRm9=KM6Jt=GU$!;#VJS>}#qW;cqekuJ7wh2Lw#A7$pr^VhPUms6*J{h*{I<5_%JOGz3J9c-pqft40?_;~lr=X$ zZ*6^`si_&^8zr2e7oU)D3&q~@xGVVk7kcfEvR8rX>8@ZQZw;O5PQ>O^3kPH?ZCjwR zNX^Rj=Dw?9y82~E?9fjN6L(YS<2chBd2WPy{Z~` zy9hopE8x$=N>82P*4mD22W%A9*--#j>{l9%rLDye=2xpYc90D1JV*VAg_*OycK)Jm zUU$!O=eR<}XPn7y2s&?OTF1K*PUX zY2-F0XuZSj5&xhFSl9ZbU!r)eQ^njJJHpVhOHwjjFHT8^EoScQuI?UY9x;^&Udfcw z8gsB~N(~J6wW^}Fm+d)|+gi>`!Hnl&>P{}*Xyca9ceH~-Z3z)B0l7$tnZKd~%_EDv z8eB};xw9`pNq2#U{FLP!4uf${Du0yuv!g>2n^nAE*BM>-z4Qe+M$WMzJ`INe?NJN^ z1Q(GKmKC0nbs%(5JruubQZglt0+)$rx=+ z|L>^f$n?UG7>-d2#}#q9Jjaqhqb1^Q^4VSRK;4VsYTa+@V0+MRcHg14y{@YUYc>BSL8r@)Af2av+T!l5Fyi#yI~ciT)3;`p+R}9G4e%KmGM#j~AeHkcpv%L5)5v@!!Ve B%6|X= literal 0 HcmV?d00001 diff --git a/__snapshots__/font--fonts-firefox.png b/__snapshots__/font--fonts-firefox.png new file mode 100644 index 0000000000000000000000000000000000000000..2483b264a8629a8e98514cfbc47c0bd1e94b761c GIT binary patch literal 3873 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 NuBM?zl^Q(ae*hW&NFx9M literal 0 HcmV?d00001 diff --git a/__snapshots__/font--fonts-webkit.png b/__snapshots__/font--fonts-webkit.png new file mode 100644 index 0000000000000000000000000000000000000000..39da7f750050ae81e2fd0de7ebd8d6b44c9a8954 GIT binary patch literal 2842 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 Date: Tue, 20 Feb 2024 16:11:07 +0100 Subject: [PATCH 13/18] change extension of FontType --- src/components/FontSizes/Text.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/FontSizes/Text.tsx b/src/components/FontSizes/Text.tsx index d59a351b..13c4fe52 100644 --- a/src/components/FontSizes/Text.tsx +++ b/src/components/FontSizes/Text.tsx @@ -1,8 +1,8 @@ -import React from "react"; +import React, {HTMLProps} from "react"; import {Size} from "../../utils/types"; import "./Text.style.scss" -export interface FontType extends Omit, HTMLSpanElement>, "children">, "className"> { +export interface FontType extends Omit, "children">, "className">, "size"> { children: string, size: Size, } From 6df5fcd48ef9ec521fd0e49b9c0433aea9e56463 Mon Sep 17 00:00:00 2001 From: Dario Date: Tue, 20 Feb 2024 16:16:01 +0100 Subject: [PATCH 14/18] fix Text stories --- src/components/FontSizes/Text.stories.tsx | 38 ++++++++++++++--------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/components/FontSizes/Text.stories.tsx b/src/components/FontSizes/Text.stories.tsx index a996cbcd..3d166fe0 100644 --- a/src/components/FontSizes/Text.stories.tsx +++ b/src/components/FontSizes/Text.stories.tsx @@ -1,24 +1,34 @@ import Text from "./Text"; import React from "react"; -import {Sizes} from "../../utils/types"; +import {Colors, Size, Sizes} from "../../utils/types"; import {Button, ButtonGroup} from "../../index"; +import Alert from "../alert/Alert"; +import {StoryObj} from "@storybook/react"; export default { title: "Font", - component: Text + component: Text, + argTypes: { + size: { + options: ["xs", "sm", "md", "lg", "xl"], + control: {type: 'radio'} + } + } }; -export const Fonts = () => <> - { - - { - Sizes.map(value => - - ) - } - + +export const TextSizes: StoryObj = { + render: (args) => { + const {size} = args + + return <> + + + }, + args: { + size: "sm" } - \ No newline at end of file +} \ No newline at end of file From 65e7129408c22c5d3580c440ef2e00b7df5101dc Mon Sep 17 00:00:00 2001 From: Dario Date: Tue, 20 Feb 2024 21:40:25 +0100 Subject: [PATCH 15/18] remove button to show just the Text Component --- src/components/FontSizes/Text.stories.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/FontSizes/Text.stories.tsx b/src/components/FontSizes/Text.stories.tsx index 3d166fe0..35d9d441 100644 --- a/src/components/FontSizes/Text.stories.tsx +++ b/src/components/FontSizes/Text.stories.tsx @@ -23,9 +23,7 @@ export const TextSizes: StoryObj = { const {size} = args return <> - }, args: { From 2c063cdac914350be58057316b5a2e55208569ec Mon Sep 17 00:00:00 2001 From: Dario Date: Tue, 20 Feb 2024 21:40:37 +0100 Subject: [PATCH 16/18] remove the Omit for the classname --- src/components/FontSizes/Text.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/FontSizes/Text.tsx b/src/components/FontSizes/Text.tsx index 13c4fe52..50316ce2 100644 --- a/src/components/FontSizes/Text.tsx +++ b/src/components/FontSizes/Text.tsx @@ -2,14 +2,14 @@ import React, {HTMLProps} from "react"; import {Size} from "../../utils/types"; import "./Text.style.scss" -export interface FontType extends Omit, "children">, "className">, "size"> { +export interface FontType extends Omit, "children">, "size"> { children: string, size: Size, } const Text: React.FC = ({ size, children, ...rest }) => { - return + return {children} } From 93e62a18c33e467a49272fe4c95ccecf6f1dd427 Mon Sep 17 00:00:00 2001 From: Dario Date: Tue, 20 Feb 2024 21:41:00 +0100 Subject: [PATCH 17/18] set the style to the right font and color --- src/components/FontSizes/Text.style.scss | 4 ++++ src/components/FontSizes/Text.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/FontSizes/Text.style.scss b/src/components/FontSizes/Text.style.scss index c6cb1f64..8ed32977 100644 --- a/src/components/FontSizes/Text.style.scss +++ b/src/components/FontSizes/Text.style.scss @@ -1,5 +1,9 @@ @import "../../styles/variables"; +.text { + color: rgba($white, .5); + font-family: Ubuntu, sans-serif; +} @each $name, $font in $sizes { .size--#{$name} { diff --git a/src/components/FontSizes/Text.tsx b/src/components/FontSizes/Text.tsx index 50316ce2..e67c99cf 100644 --- a/src/components/FontSizes/Text.tsx +++ b/src/components/FontSizes/Text.tsx @@ -9,7 +9,7 @@ export interface FontType extends Omit, "childre const Text: React.FC = ({ size, children, ...rest }) => { - return + return {children} } From 99bf86cc2ced20158b948779a6ad4859ec05bf64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 24 Feb 2024 13:49:11 +0000 Subject: [PATCH 18/18] Update image snapshots --- __snapshots__/font--text-sizes-chromium.png | Bin 0 -> 503 bytes __snapshots__/font--text-sizes-firefox.png | Bin 0 -> 563 bytes __snapshots__/font--text-sizes-webkit.png | Bin 0 -> 474 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 __snapshots__/font--text-sizes-chromium.png create mode 100644 __snapshots__/font--text-sizes-firefox.png create mode 100644 __snapshots__/font--text-sizes-webkit.png diff --git a/__snapshots__/font--text-sizes-chromium.png b/__snapshots__/font--text-sizes-chromium.png new file mode 100644 index 0000000000000000000000000000000000000000..2108cbada17fe59be9bf78bfd579f2783e3976d5 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-#^NA%Cx&(BWL^T<8$DedLoyoQ z-q`CM9VpT8@%grAQpvp^n_IY5n|ozjIvB&-y9BsH1z5aa-dOw3_HD>^5BARPg!aC= z1qsfgB1&yuy;e8$JoOFDzaMiH;No-gd+A+K|JqXK9{ah-zOOS5s^vbo_+RdT2=7EU z=Oq^fGEH2h(3zRDC-5mRkC<@QZ<3ts!EL!-OXX|g&M|*@_SUA;WzM>F22;JJ9@<_T zblBO#uPN&7EdAHxc2+8XB@`A&Aeo=^4=%S1Bc5hAjq`CU1Xw?CP3>C73wV4Zmn%>PVFGbq{`bN%SH+(#cBZO%Wwe)awSYuQ_~nd}qt z-&-?WeI>tVm;1s32Md|Bga!MbO7^tOnXVsscKyesqNeZN?`@O$sovr`uoUO7%{a4Gre-hJD z3(Ly*9Lmd&9J$D!_GF{AUsJeoq|!u=b+0$=-RixwCh^e=_RU|+<0R0-2o`eB*o1A0 V8#)sA>H}kv!PC{xWt~$(699m`<4OPk literal 0 HcmV?d00001 diff --git a/__snapshots__/font--text-sizes-firefox.png b/__snapshots__/font--text-sizes-firefox.png new file mode 100644 index 0000000000000000000000000000000000000000..41194fb3128ad627249bd7ab2e148a225e8807c0 GIT binary patch literal 563 zcmV-30?hr1P)oE?Sz~@%Zp4 zTt-TfwDe?zM}(obrytJio6n`*i<}&vVs>VpeOFswjj_=wY;Eqc`^Kg^HgkAzY>Xl% zvk7*4Dq`cJadvi&!GTd$=x342>T-7ER+iV<;&lx*7#ni{N002ovPDHLkV1kc# B`LzH5 literal 0 HcmV?d00001 diff --git a/__snapshots__/font--text-sizes-webkit.png b/__snapshots__/font--text-sizes-webkit.png new file mode 100644 index 0000000000000000000000000000000000000000..751225c1e9b4ae8f48a99a4e9b1994db00061928 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^MnG)F!2~3^&cuEIQfx`y?k)`fL2$v|<&zm082de4 z977^n-`?2k&6Fr};Nx?f+AG5On}j)Km^4LXl&hqLj64=Eo zc4$qDgMpOF**5}vKgXFcOE*o(cv0?Q`e)zek2W^nYbxf=?n~_K{#`Yw7RDA+rQFZIl#dnSM4cck7a*kLTXc7h##MQy%30 zGVAM0^9Z~9E(!))<^5NzI#&3t-*J7pO=U&U>Z|F`mpLyy+Uyb}GW#>P@x+XZa&^AD zhfb(|t6D!Ls^Z?tRkJkA?2n7OzAc$@x|=C+M%CVndETw7qYv61+oV&%t-L&RrA?aA z&Z{Si_Wv)NW~)D4zAe2pR=p*_i!*TdT{*=gSxaXvYu;w?<7B*e*X`))pMTC)<(z%^ zplvx@^TX!{uTQl