diff --git a/components/src/DesignTokens/DesignTokens.mdx b/components/src/DesignTokens/DesignTokens.mdx index 2261eb71..d9b27df2 100644 --- a/components/src/DesignTokens/DesignTokens.mdx +++ b/components/src/DesignTokens/DesignTokens.mdx @@ -1,28 +1,36 @@ -import { Title, Story, ColorPalette, ColorItem, Meta, Typeset, Canvas } from '@storybook/addon-docs/blocks'; -import { shades, scales, typography } from "./Tokens" - -import * as HeadlineStories from "../Headline/Headline.stories.svelte" -import * as CopyStories from "../Copy/Copy.stories.svelte" -import * as CaptionStories from "../Caption/Caption.stories.svelte" -import * as NoteStories from "../Note/Note.stories.svelte" - - +import { + Title, + Story, + ColorPalette, + ColorItem, + Meta, + Typeset, + Canvas +} from '@storybook/addon-docs/blocks'; +import { shades, scales, typography } from './Tokens'; + +import * as HeadlineStories from '../Headline/Headline.stories.svelte'; +import * as CopyStories from '../Copy/Copy.stories.svelte'; +import * as CaptionStories from '../Caption/Caption.stories.svelte'; +import * as NoteStories from '../Note/Note.stories.svelte'; + + # Design Tokens ## Table of Contents - + - [Usage](#usage) - [Web](#web) - - [Figma](#figma) + - [Figma](#figma) - [Typography](#typography) - [Sizes](#sizes) - [Styles](#styles) - [Colours](#colours) - - [Shades](#shades) - - [Linear scales](#linear-scales) - - [Categorical Scales](#categorical-scales) - - [Divergent Scales](#divergent-scales) + - [Shades](#shades) + - [Linear scales](#linear-scales) + - [Categorical Scales](#categorical-scales) + - [Divergent Scales](#divergent-scales) ## Usage @@ -32,78 +40,125 @@ The `` component makes colours, type sizes and other design tokens ```html -

I'm a sample paragraph

+

I'm a sample paragraph

``` You can also import `tokens` directly to use them in Javascript: ```jsx -import tokens from "@swr-data-lab/components" +import tokens from '@swr-data-lab/components'; import { scaleThreshold } from 'd3-scale'; const sampleScale = scaleThreshold([0, 10], tokens.scales.red_blue); ``` ### Figma -The tokens on this page are available as a [Figma library](https://www.figma.com/design/Wrd7uUV3GxpNXXkM5ozuHk/Datalab-Design-Tokens?node-id=0-1&t=iOqDxhuMdvEyY8VK-1). This is enabled by default for any file in the [SWR Data Lab team](https://www.figma.com/files/1125823985461580916/team/1415988138343592768). - +The tokens on this page are available as a [Figma library](https://www.figma.com/design/Wrd7uUV3GxpNXXkM5ozuHk/Datalab-Design-Tokens?node-id=0-1&t=iOqDxhuMdvEyY8VK-1). This is enabled by default for any file in the [SWR Data Lab team](https://www.figma.com/files/1125823985461580916/team/1415988138343592768). ## Typography Type sizes and paragraph styles are designed to match the typography on [swr.de](https://www.swr.de/). **Styles** come with built-in settings for `line-height`, `letter-spacing`, etc. and should be preferred over using **sizes** directly. ### Styles + #### H2 - + + #### Copy - + + #### Caption - + + #### Note - + + ### Sizes - { - return size -}).reverse()}/> + { + return size; + }) + .reverse()} +/> ## Colours + ### Shades + -{["violet", "plum", "pink", "red", "orange", "yellow", "apple" , "forest", "teal", "blue", "gray"].map((el, i) => { - return( - ) -})} + {[ + 'violet', + 'plum', + 'pink', + 'red', + 'orange', + 'yellow', + 'apple', + 'forest', + 'teal', + 'blue', + 'gray' + ].map((el, i) => { + return ( + + ); + })} ### Linear Scales + ### Categorical Scales + ### Divergent Scales -{["red_blue", "red_violet", "red_forest", "red_apple", "red_teal", "violet_teal", "violet_orange", "blue_pink", "teal_pink", "forest_plum", "apple_plum", "orange_blue", "orange_teal"].map((el, _) => { - return( {return c[0].toUpperCase() + c.slice(1)}).join("/")}`} - subtitle={el} - colors={scales[el]} - />) -})} - \ No newline at end of file + {[ + 'red_blue', + 'red_violet', + 'red_forest', + 'red_apple', + 'red_teal', + 'violet_teal', + 'violet_orange', + 'blue_pink', + 'teal_pink', + 'forest_plum', + 'apple_plum', + 'orange_blue', + 'orange_teal' + ].map((el, _) => { + return ( + { + return c[0].toUpperCase() + c.slice(1); + }) + .join('/')}`} + subtitle={el} + colors={scales[el]} + /> + ); + })} + diff --git a/components/src/DesignTokens/DesignTokens.svelte b/components/src/DesignTokens/DesignTokens.svelte index f33d5b3b..c7ad7fac 100644 --- a/components/src/DesignTokens/DesignTokens.svelte +++ b/components/src/DesignTokens/DesignTokens.svelte @@ -54,17 +54,17 @@ --fs-base: 1.125rem; --fs-large-1: 1.25rem; --fs-large-2: 1.5rem; - --fs-large-3: 1.75rem; + --fs-large-3: 2rem; --fs-large-4: 2.25rem; - @media (min-width: base.$bp-m) { + @media (min-width: 1024px) { --fs-small-3: 0.75rem; --fs-small-2: 0.875rem; --fs-small-1: 1rem; --fs-base: 1.25rem; --fs-large-1: 1.5rem; --fs-large-2: 2rem; - --fs-large-3: 2.5rem; + --fs-large-3: 3rem; --fs-large-4: 3.5rem; } } diff --git a/components/src/DesignTokens/Tokens.ts b/components/src/DesignTokens/Tokens.ts index 9cdc9cd0..cc2fef79 100644 --- a/components/src/DesignTokens/Tokens.ts +++ b/components/src/DesignTokens/Tokens.ts @@ -181,7 +181,7 @@ const typography = { 'fs-base': '1.25rem', 'fs-large-1': '1.5rem', 'fs-large-2': '2rem', - 'fs-large-3': '2.5rem', + 'fs-large-3': '3rem', 'fs-large-4': '3.5rem' } }