From 3d3e9076088c5e72ed89fb97109b75dcf6e09d96 Mon Sep 17 00:00:00 2001 From: Halvor Haugan <83693529+HalvorHaugan@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:13:39 +0200 Subject: [PATCH 01/14] =?UTF-8?q?Ny=20spacing=20token=20p=C3=A5=200.375rem?= =?UTF-8?q?=20(#2370)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/silent-impalas-laugh.md | 6 ++ @navikt/core/css/chips.css | 4 +- @navikt/core/css/copybutton.css | 2 +- @navikt/core/css/form/radio-checkbox.css | 6 +- @navikt/core/css/form/select.css | 2 +- @navikt/core/css/form/textarea.css | 2 +- @navikt/core/css/pagination.css | 3 +- @navikt/core/css/tabs.css | 4 +- @navikt/core/css/tag.css | 2 +- .../core/react/src/chips/chips.stories.tsx | 28 +++++---- .../src/form/stories/textarea.stories.tsx | 58 +++++++------------ .../core/react/src/layout/utilities/css.ts | 1 + @navikt/core/tokens/docs.json | 1 + @navikt/core/tokens/src/spacing.json | 3 + .../core/tokens/stories/spacing.stories.tsx | 19 ++---- 15 files changed, 62 insertions(+), 79 deletions(-) create mode 100644 .changeset/silent-impalas-laugh.md diff --git a/.changeset/silent-impalas-laugh.md b/.changeset/silent-impalas-laugh.md new file mode 100644 index 0000000000..09eae255a9 --- /dev/null +++ b/.changeset/silent-impalas-laugh.md @@ -0,0 +1,6 @@ +--- +"@navikt/ds-tokens": patch +"@navikt/ds-css": patch +--- + +Ny spacing token på 0.375rem diff --git a/@navikt/core/css/chips.css b/@navikt/core/css/chips.css index b3a7142c8e..51b98098e7 100644 --- a/@navikt/core/css/chips.css +++ b/@navikt/core/css/chips.css @@ -160,11 +160,11 @@ } .navds-chips--icon-left { - padding-left: 0.375rem; + padding-left: var(--a-spacing-1-alt); } .navds-chips--icon-right { - padding-right: 0.375rem; + padding-right: var(--a-spacing-1-alt); } .navds-chips--small .navds-chips--icon-right { diff --git a/@navikt/core/css/copybutton.css b/@navikt/core/css/copybutton.css index 9a88188fda..03ca04c1ad 100644 --- a/@navikt/core/css/copybutton.css +++ b/@navikt/core/css/copybutton.css @@ -175,7 +175,7 @@ } .navds-copybutton--small > .navds-copybutton__content { - gap: 0.375rem; + gap: var(--a-spacing-1-alt); } .navds-copybutton--xsmall > .navds-copybutton__content { diff --git a/@navikt/core/css/form/radio-checkbox.css b/@navikt/core/css/form/radio-checkbox.css index 957b17f317..e95b21259d 100644 --- a/@navikt/core/css/form/radio-checkbox.css +++ b/@navikt/core/css/form/radio-checkbox.css @@ -59,7 +59,7 @@ .navds-checkbox--small > .navds-checkbox__label, .navds-radio--small > .navds-radio__label { - padding: 0.375rem 0; + padding: var(--a-spacing-1-alt) 0; } .navds-checkbox--small > .navds-checkbox__label::before, @@ -101,7 +101,7 @@ content: ""; position: absolute; top: 50%; - transform: translate(0.375rem, -50%); + transform: translate(var(--a-spacing-1-alt), -50%); background-color: var(--ac-radio-checkbox-bg, var(--a-surface-default)); width: 0.75rem; height: 0.25rem; @@ -126,7 +126,7 @@ color: var(--ac-radio-checkbox-bg, var(--a-surface-default)); position: absolute; height: 1.5rem; - transform: translate(0.375rem); + transform: translate(var(--a-spacing-1-alt)); pointer-events: none; } diff --git a/@navikt/core/css/form/select.css b/@navikt/core/css/form/select.css index 834c8d3c99..429e4eb727 100644 --- a/@navikt/core/css/form/select.css +++ b/@navikt/core/css/form/select.css @@ -51,7 +51,7 @@ } .navds-form-field--small .navds-select__chevron { - right: 0.375rem; + right: var(--a-spacing-1-alt); } /** diff --git a/@navikt/core/css/form/textarea.css b/@navikt/core/css/form/textarea.css index a613808518..7e0b8761e6 100644 --- a/@navikt/core/css/form/textarea.css +++ b/@navikt/core/css/form/textarea.css @@ -62,7 +62,7 @@ } .navds-form-field--small .navds-textarea__input { - padding: 0.375rem; + padding: var(--a-spacing-1-alt); } .navds-form-field--small .navds-textarea--counter.navds-textarea__input { diff --git a/@navikt/core/css/pagination.css b/@navikt/core/css/pagination.css index e540f2c48a..dc1317f684 100644 --- a/@navikt/core/css/pagination.css +++ b/@navikt/core/css/pagination.css @@ -52,8 +52,7 @@ } .navds-pagination--small .navds-pagination__prev-next:where(.navds-pagination--prev-next--with-text) { - padding-left: 0.375rem; - padding-right: 0.375rem; + padding-inline: var(--a-spacing-1-alt); } .navds-pagination--xsmall .navds-pagination__prev-next:where(.navds-pagination--prev-next--with-text) { diff --git a/@navikt/core/css/tabs.css b/@navikt/core/css/tabs.css index 97aa9492bd..9aac4d0ce8 100644 --- a/@navikt/core/css/tabs.css +++ b/@navikt/core/css/tabs.css @@ -37,7 +37,7 @@ } .navds-tabs--small .navds-tabs__scroll-button { - padding: 0.375rem var(--a-spacing-4); + padding: var(--a-spacing-1-alt) var(--a-spacing-4); width: 2rem; } @@ -93,7 +93,7 @@ .navds-tabs__tab--small { min-height: 2rem; - padding: 0.375rem var(--a-spacing-4); + padding: var(--a-spacing-1-alt) var(--a-spacing-4); } .navds-tabs__tab-icon--top, diff --git a/@navikt/core/css/tag.css b/@navikt/core/css/tag.css index 3854e74d8f..4a843f8135 100644 --- a/@navikt/core/css/tag.css +++ b/@navikt/core/css/tag.css @@ -11,7 +11,7 @@ .navds-tag--small { min-height: 1.5rem; - padding: 0 0.375rem; + padding: 0 var(--a-spacing-1-alt); } .navds-tag--xsmall { diff --git a/@navikt/core/react/src/chips/chips.stories.tsx b/@navikt/core/react/src/chips/chips.stories.tsx index a2e5dac6d7..4ce53cffbd 100644 --- a/@navikt/core/react/src/chips/chips.stories.tsx +++ b/@navikt/core/react/src/chips/chips.stories.tsx @@ -1,24 +1,12 @@ +import { Meta } from "@storybook/react"; import React, { useState } from "react"; import { Chips } from "."; -export default { +const meta: Meta = { title: "ds-react/Chips", component: Chips, - argTypes: { - type: { - control: { - type: "radio", - options: ["toggle", "removable"], - }, - }, - size: { - control: { - type: "radio", - options: ["medium", "small"], - }, - }, - }, }; +export default meta; const options = ["Norsk", "Dansk", "Svensk", "Tysk", "Spansk"]; @@ -61,6 +49,16 @@ export const Default = (props) => { ); }; +Default.argTypes = { + type: { + control: { type: "radio" }, + options: ["toggle", "removable"], + }, + size: { + control: { type: "radio" }, + options: ["medium", "small"], + }, +}; export const Toggle = () => { const [selected, setSelected] = useState([2, 4]); diff --git a/@navikt/core/react/src/form/stories/textarea.stories.tsx b/@navikt/core/react/src/form/stories/textarea.stories.tsx index 1cd7a84332..9e848e64b2 100644 --- a/@navikt/core/react/src/form/stories/textarea.stories.tsx +++ b/@navikt/core/react/src/form/stories/textarea.stories.tsx @@ -1,52 +1,36 @@ -import { Meta } from "@storybook/react"; +import { Meta, StoryObj } from "@storybook/react"; import React from "react"; import { Textarea } from "../index"; -export default { + +const meta: Meta = { title: "ds-react/Textarea", component: Textarea, - argTypes: { - size: { - control: { - type: "radio", - options: ["medium", "small"], - }, - }, - description: { - type: "string", - }, - error: { - type: "string", - }, - hideLabel: { - type: "boolean", - }, - disabled: { - type: "boolean", - }, - maxRows: { - type: "number", - }, - minRows: { - type: "number", - }, - }, -} as Meta; +}; +export default meta; -export const Default = { +export const Default: StoryObj = { render: (props) => { - return ( -