From a04b3e479bb0a865c958c6b56f7a49aa6d49ec5a Mon Sep 17 00:00:00 2001 From: Frode Kolstad Date: Wed, 28 Jan 2026 12:49:46 +0100 Subject: [PATCH 1/2] feat(tokens): Lagt til fixed-spacing (som ikke endrer seg mellom devicer) --- tokens/$themes.json | 50 +++++++++++++------------------ tokens/public/device/desktop.json | 14 +++++++++ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/tokens/$themes.json b/tokens/$themes.json index 7529dff6..a7abd89f 100644 --- a/tokens/$themes.json +++ b/tokens/$themes.json @@ -1461,11 +1461,6 @@ "font-size.x-large": "b2e60ed156ea4d790cc5d3874bebc3831b14f81f", "font-size.2x-large": "57c5fd3483f53e9216f2ef925d8c545694e504cf", "font-size.3x-large": "9de2b4e936207b93e555c10df80ebb615928072f", - "boolean.device.desktop": "82addb6489d5c73c0609d74af78a10ab7bc1f2ca", - "boolean.device.desktop-tablet": "7c42ad69f1fb25ee2584c0552b71b9ce7130b885", - "boolean.device.tablet": "8e99228277dcf0a3dcc5a1ed7b1b3aca7d6f9df4", - "boolean.device.tablet-mobile": "55fff311064ab4693923a2809c5f89f4bb2f06f9", - "boolean.device.mobile": "475a4ca565edcce9f863fc68ec8d8cd17d5964f9", "sizing.fixed-sizing.2x-small": "6b177c77e5183b534bb72dfab5f45ef5cd644810", "sizing.fixed-sizing.x-small": "029d81c94816d1fe1c7c62612458a755164bed01", "sizing.fixed-sizing.small": "ccb1b8bc106ee99f753849cab9b92bb4d9d1d5a0", @@ -1473,7 +1468,10 @@ "sizing.fixed-sizing.large": "d181b13484bee88a4c3bbf785e1caa5e96a2bc77", "sizing.fixed-sizing.x-large": "94da23267f15dce2a2dafa56cb34f9b2a0a01e60", "sizing.fixed-sizing.2x-large": "af8713223ab2b8cfd820a64675ceeef93c670372", - "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9" + "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9", + "spacing.fixed-spacing.small": "c6a5f0d8c9f26e35bccd8e525c823a13309f2768", + "spacing.fixed-spacing.medium": "4ed1c642e2c89851e6f1776562f3110d35e01919", + "spacing.fixed-spacing.large": "eaa9c10a6ad463fb224a1d022df8d1ebc9cf81d9" }, "group": "Device" }, @@ -1609,11 +1607,6 @@ "font-size.x-large": "b2e60ed156ea4d790cc5d3874bebc3831b14f81f", "font-size.2x-large": "57c5fd3483f53e9216f2ef925d8c545694e504cf", "font-size.3x-large": "9de2b4e936207b93e555c10df80ebb615928072f", - "boolean.device.desktop": "82addb6489d5c73c0609d74af78a10ab7bc1f2ca", - "boolean.device.desktop-tablet": "7c42ad69f1fb25ee2584c0552b71b9ce7130b885", - "boolean.device.tablet": "8e99228277dcf0a3dcc5a1ed7b1b3aca7d6f9df4", - "boolean.device.tablet-mobile": "55fff311064ab4693923a2809c5f89f4bb2f06f9", - "boolean.device.mobile": "475a4ca565edcce9f863fc68ec8d8cd17d5964f9", "sizing.fixed-sizing.2x-small": "6b177c77e5183b534bb72dfab5f45ef5cd644810", "sizing.fixed-sizing.x-small": "029d81c94816d1fe1c7c62612458a755164bed01", "sizing.fixed-sizing.small": "ccb1b8bc106ee99f753849cab9b92bb4d9d1d5a0", @@ -1621,7 +1614,10 @@ "sizing.fixed-sizing.large": "d181b13484bee88a4c3bbf785e1caa5e96a2bc77", "sizing.fixed-sizing.x-large": "94da23267f15dce2a2dafa56cb34f9b2a0a01e60", "sizing.fixed-sizing.2x-large": "af8713223ab2b8cfd820a64675ceeef93c670372", - "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9" + "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9", + "spacing.fixed-spacing.small": "c6a5f0d8c9f26e35bccd8e525c823a13309f2768", + "spacing.fixed-spacing.medium": "4ed1c642e2c89851e6f1776562f3110d35e01919", + "spacing.fixed-spacing.large": "eaa9c10a6ad463fb224a1d022df8d1ebc9cf81d9" }, "group": "Device" }, @@ -1755,11 +1751,6 @@ "font-size.x-large": "b2e60ed156ea4d790cc5d3874bebc3831b14f81f", "font-size.2x-large": "57c5fd3483f53e9216f2ef925d8c545694e504cf", "font-size.3x-large": "9de2b4e936207b93e555c10df80ebb615928072f", - "boolean.device.desktop": "82addb6489d5c73c0609d74af78a10ab7bc1f2ca", - "boolean.device.desktop-tablet": "7c42ad69f1fb25ee2584c0552b71b9ce7130b885", - "boolean.device.tablet": "8e99228277dcf0a3dcc5a1ed7b1b3aca7d6f9df4", - "boolean.device.tablet-mobile": "55fff311064ab4693923a2809c5f89f4bb2f06f9", - "boolean.device.mobile": "475a4ca565edcce9f863fc68ec8d8cd17d5964f9", "sizing.fixed-sizing.2x-small": "6b177c77e5183b534bb72dfab5f45ef5cd644810", "sizing.fixed-sizing.x-small": "029d81c94816d1fe1c7c62612458a755164bed01", "sizing.fixed-sizing.small": "ccb1b8bc106ee99f753849cab9b92bb4d9d1d5a0", @@ -1767,7 +1758,10 @@ "sizing.fixed-sizing.large": "d181b13484bee88a4c3bbf785e1caa5e96a2bc77", "sizing.fixed-sizing.x-large": "94da23267f15dce2a2dafa56cb34f9b2a0a01e60", "sizing.fixed-sizing.2x-large": "af8713223ab2b8cfd820a64675ceeef93c670372", - "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9" + "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9", + "spacing.fixed-spacing.small": "c6a5f0d8c9f26e35bccd8e525c823a13309f2768", + "spacing.fixed-spacing.medium": "4ed1c642e2c89851e6f1776562f3110d35e01919", + "spacing.fixed-spacing.large": "eaa9c10a6ad463fb224a1d022df8d1ebc9cf81d9" }, "$figmaCollectionId": "VariableCollectionId:1972:338", "$figmaModeId": "1972:14", @@ -1865,11 +1859,6 @@ "font-size.x-large": "b2e60ed156ea4d790cc5d3874bebc3831b14f81f", "font-size.2x-large": "57c5fd3483f53e9216f2ef925d8c545694e504cf", "font-size.3x-large": "9de2b4e936207b93e555c10df80ebb615928072f", - "boolean.device.desktop": "82addb6489d5c73c0609d74af78a10ab7bc1f2ca", - "boolean.device.desktop-tablet": "7c42ad69f1fb25ee2584c0552b71b9ce7130b885", - "boolean.device.tablet": "8e99228277dcf0a3dcc5a1ed7b1b3aca7d6f9df4", - "boolean.device.tablet-mobile": "55fff311064ab4693923a2809c5f89f4bb2f06f9", - "boolean.device.mobile": "475a4ca565edcce9f863fc68ec8d8cd17d5964f9", "sizing.fixed-sizing.2x-small": "6b177c77e5183b534bb72dfab5f45ef5cd644810", "sizing.fixed-sizing.x-small": "029d81c94816d1fe1c7c62612458a755164bed01", "sizing.fixed-sizing.small": "ccb1b8bc106ee99f753849cab9b92bb4d9d1d5a0", @@ -1877,7 +1866,10 @@ "sizing.fixed-sizing.large": "d181b13484bee88a4c3bbf785e1caa5e96a2bc77", "sizing.fixed-sizing.x-large": "94da23267f15dce2a2dafa56cb34f9b2a0a01e60", "sizing.fixed-sizing.2x-large": "af8713223ab2b8cfd820a64675ceeef93c670372", - "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9" + "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9", + "spacing.fixed-spacing.small": "c6a5f0d8c9f26e35bccd8e525c823a13309f2768", + "spacing.fixed-spacing.medium": "4ed1c642e2c89851e6f1776562f3110d35e01919", + "spacing.fixed-spacing.large": "eaa9c10a6ad463fb224a1d022df8d1ebc9cf81d9" }, "group": "Device" }, @@ -2399,11 +2391,6 @@ "font-size.x-large": "b2e60ed156ea4d790cc5d3874bebc3831b14f81f", "font-size.2x-large": "57c5fd3483f53e9216f2ef925d8c545694e504cf", "font-size.3x-large": "9de2b4e936207b93e555c10df80ebb615928072f", - "boolean.device.desktop": "82addb6489d5c73c0609d74af78a10ab7bc1f2ca", - "boolean.device.desktop-tablet": "7c42ad69f1fb25ee2584c0552b71b9ce7130b885", - "boolean.device.tablet": "8e99228277dcf0a3dcc5a1ed7b1b3aca7d6f9df4", - "boolean.device.tablet-mobile": "55fff311064ab4693923a2809c5f89f4bb2f06f9", - "boolean.device.mobile": "475a4ca565edcce9f863fc68ec8d8cd17d5964f9", "sizing.fixed-sizing.2x-small": "6b177c77e5183b534bb72dfab5f45ef5cd644810", "sizing.fixed-sizing.x-small": "029d81c94816d1fe1c7c62612458a755164bed01", "sizing.fixed-sizing.small": "ccb1b8bc106ee99f753849cab9b92bb4d9d1d5a0", @@ -2411,7 +2398,10 @@ "sizing.fixed-sizing.large": "d181b13484bee88a4c3bbf785e1caa5e96a2bc77", "sizing.fixed-sizing.x-large": "94da23267f15dce2a2dafa56cb34f9b2a0a01e60", "sizing.fixed-sizing.2x-large": "af8713223ab2b8cfd820a64675ceeef93c670372", - "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9" + "sizing.fixed-sizing.3x-large": "a00b75e5552d46193d42722dd4a0ff0c5506edc9", + "spacing.fixed-spacing.small": "c6a5f0d8c9f26e35bccd8e525c823a13309f2768", + "spacing.fixed-spacing.medium": "4ed1c642e2c89851e6f1776562f3110d35e01919", + "spacing.fixed-spacing.large": "eaa9c10a6ad463fb224a1d022df8d1ebc9cf81d9" }, "group": "Device" } diff --git a/tokens/public/device/desktop.json b/tokens/public/device/desktop.json index 33452309..4def02af 100644 --- a/tokens/public/device/desktop.json +++ b/tokens/public/device/desktop.json @@ -57,6 +57,20 @@ "$type": "spacing", "$value": "{spacing.48x}" } + }, + "fixed-spacing": { + "small": { + "$type": "spacing", + "$value": "{dimension.4x}" + }, + "medium": { + "$type": "spacing", + "$value": "{dimension.6x}" + }, + "large": { + "$type": "spacing", + "$value": "{dimension.10x}" + } } }, "sizing": { From e4925d527d81fc7f1d76fbee6ecf2b13327a3323 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 28 Jan 2026 11:52:12 +0000 Subject: [PATCH 2/2] =?UTF-8?q?(tokens):=20oppdatert=20css=20basert=20p?= =?UTF-8?q?=C3=A5=20nye=20tokens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc-site/.vitepress/theme/styles/nve_theme.css | 7 +++++-- doc-site/.vitepress/theme/styles/rme_theme.css | 7 +++++-- doc-site/.vitepress/theme/styles/varsom_theme.css | 7 +++++-- public/css/nve.css | 7 +++++-- public/css/rme.css | 7 +++++-- public/css/varsom.css | 7 +++++-- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/doc-site/.vitepress/theme/styles/nve_theme.css b/doc-site/.vitepress/theme/styles/nve_theme.css index f5fe7e2b..3bea5de5 100644 --- a/doc-site/.vitepress/theme/styles/nve_theme.css +++ b/doc-site/.vitepress/theme/styles/nve_theme.css @@ -564,6 +564,9 @@ --spacing-content-margin-top: var(--spacing-40x); --spacing-content-margin-bottom: var(--spacing-88x); --spacing-content-margin-left-right: var(--spacing-48x); + --spacing-fixed-spacing-small: var(--dimension-4x); + --spacing-fixed-spacing-medium: var(--dimension-6x); + --spacing-fixed-spacing-large: var(--dimension-10x); --sizing-4x-small: var(--dimension-2x); --sizing-3x-small: var(--dimension-4x); --sizing-2x-small: var(--dimension-6x); @@ -609,8 +612,10 @@ --typography-body-medium-underline: var(--font-weight-regular) var(--font-size-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small-underline: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-body-x-small: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-x-small-underline: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-medium: var(--dimension-5x); /** 18 px */ --typography-body-compact-large-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-large-underline-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-medium-compact: var(--font-weight-regular) var(--font-size-small)/var(--line-height-1) var(--font-family-source-sans-pro); @@ -628,12 +633,10 @@ --typography-label-medium-light: var(--font-weight-regular) var(--font-size-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small: var(--font-weight-semibold) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small-light: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); - --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-label-x-small: var(--font-weight-semibold) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-x-small-light: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --font-size-x-small: var(--dimension-4x); /** 14 px */ --font-size-small: var(--dimension-4-5x); /** 16 px */ - --font-size-medium: var(--dimension-5x); /** 18 px */ --font-size-large: var(--dimension-6x); /** 20 px */ --font-size-x-large: var(--dimension-8x); /** 24 px */ --font-size-2x-large: var(--dimension-10x); /** 32 px */ diff --git a/doc-site/.vitepress/theme/styles/rme_theme.css b/doc-site/.vitepress/theme/styles/rme_theme.css index 9e02039d..973611a9 100644 --- a/doc-site/.vitepress/theme/styles/rme_theme.css +++ b/doc-site/.vitepress/theme/styles/rme_theme.css @@ -564,6 +564,9 @@ --spacing-content-margin-top: var(--spacing-40x); --spacing-content-margin-bottom: var(--spacing-88x); --spacing-content-margin-left-right: var(--spacing-48x); + --spacing-fixed-spacing-small: var(--dimension-4x); + --spacing-fixed-spacing-medium: var(--dimension-6x); + --spacing-fixed-spacing-large: var(--dimension-10x); --sizing-4x-small: var(--dimension-2x); --sizing-3x-small: var(--dimension-4x); --sizing-2x-small: var(--dimension-6x); @@ -609,8 +612,10 @@ --typography-body-medium-underline: var(--font-weight-regular) var(--font-size-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small-underline: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-body-x-small: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-x-small-underline: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-medium: var(--dimension-5x); /** 18 px */ --typography-body-compact-large-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-large-underline-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-medium-compact: var(--font-weight-regular) var(--font-size-small)/var(--line-height-1) var(--font-family-source-sans-pro); @@ -628,12 +633,10 @@ --typography-label-medium-light: var(--font-weight-regular) var(--font-size-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small: var(--font-weight-semibold) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small-light: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); - --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-label-x-small: var(--font-weight-semibold) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-x-small-light: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --font-size-x-small: var(--dimension-4x); /** 14 px */ --font-size-small: var(--dimension-4-5x); /** 16 px */ - --font-size-medium: var(--dimension-5x); /** 18 px */ --font-size-large: var(--dimension-6x); /** 20 px */ --font-size-x-large: var(--dimension-8x); /** 24 px */ --font-size-2x-large: var(--dimension-10x); /** 32 px */ diff --git a/doc-site/.vitepress/theme/styles/varsom_theme.css b/doc-site/.vitepress/theme/styles/varsom_theme.css index 894e0431..19b0da5c 100644 --- a/doc-site/.vitepress/theme/styles/varsom_theme.css +++ b/doc-site/.vitepress/theme/styles/varsom_theme.css @@ -564,6 +564,9 @@ --spacing-content-margin-top: var(--spacing-40x); --spacing-content-margin-bottom: var(--spacing-88x); --spacing-content-margin-left-right: var(--spacing-48x); + --spacing-fixed-spacing-small: var(--dimension-4x); + --spacing-fixed-spacing-medium: var(--dimension-6x); + --spacing-fixed-spacing-large: var(--dimension-10x); --sizing-4x-small: var(--dimension-2x); --sizing-3x-small: var(--dimension-4x); --sizing-2x-small: var(--dimension-6x); @@ -609,8 +612,10 @@ --typography-body-medium-underline: var(--font-weight-regular) var(--font-size-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small-underline: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-body-x-small: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-x-small-underline: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-medium: var(--dimension-5x); /** 18 px */ --typography-body-compact-large-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-large-underline-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-medium-compact: var(--font-weight-regular) var(--font-size-small)/var(--line-height-1) var(--font-family-source-sans-pro); @@ -628,12 +633,10 @@ --typography-label-medium-light: var(--font-weight-regular) var(--font-size-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small: var(--font-weight-semibold) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small-light: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); - --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-label-x-small: var(--font-weight-semibold) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-x-small-light: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --font-size-x-small: var(--dimension-4x); /** 14 px */ --font-size-small: var(--dimension-4-5x); /** 16 px */ - --font-size-medium: var(--dimension-5x); /** 18 px */ --font-size-large: var(--dimension-6x); /** 20 px */ --font-size-x-large: var(--dimension-8x); /** 24 px */ --font-size-2x-large: var(--dimension-10x); /** 32 px */ diff --git a/public/css/nve.css b/public/css/nve.css index 87aae6ba..8c29c418 100644 --- a/public/css/nve.css +++ b/public/css/nve.css @@ -570,6 +570,9 @@ --spacing-content-margin-top: var(--spacing-40x); --spacing-content-margin-bottom: var(--spacing-88x); --spacing-content-margin-left-right: var(--spacing-48x); + --spacing-fixed-spacing-small: var(--dimension-4x); + --spacing-fixed-spacing-medium: var(--dimension-6x); + --spacing-fixed-spacing-large: var(--dimension-10x); --sizing-4x-small: var(--dimension-2x); --sizing-3x-small: var(--dimension-4x); --sizing-2x-small: var(--dimension-6x); @@ -615,8 +618,10 @@ --typography-body-medium-underline: var(--font-weight-regular) var(--font-size-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small-underline: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-body-x-small: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-x-small-underline: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-medium: var(--dimension-5x); /** 18 px */ --typography-body-compact-large-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-large-underline-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-medium-compact: var(--font-weight-regular) var(--font-size-small)/var(--line-height-1) var(--font-family-source-sans-pro); @@ -634,12 +639,10 @@ --typography-label-medium-light: var(--font-weight-regular) var(--font-size-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small: var(--font-weight-semibold) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small-light: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); - --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-label-x-small: var(--font-weight-semibold) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-x-small-light: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --font-size-x-small: var(--dimension-4x); /** 14 px */ --font-size-small: var(--dimension-4-5x); /** 16 px */ - --font-size-medium: var(--dimension-5x); /** 18 px */ --font-size-large: var(--dimension-6x); /** 20 px */ --font-size-x-large: var(--dimension-8x); /** 24 px */ --font-size-2x-large: var(--dimension-10x); /** 32 px */ diff --git a/public/css/rme.css b/public/css/rme.css index 898a1321..64008f0b 100644 --- a/public/css/rme.css +++ b/public/css/rme.css @@ -570,6 +570,9 @@ --spacing-content-margin-top: var(--spacing-40x); --spacing-content-margin-bottom: var(--spacing-88x); --spacing-content-margin-left-right: var(--spacing-48x); + --spacing-fixed-spacing-small: var(--dimension-4x); + --spacing-fixed-spacing-medium: var(--dimension-6x); + --spacing-fixed-spacing-large: var(--dimension-10x); --sizing-4x-small: var(--dimension-2x); --sizing-3x-small: var(--dimension-4x); --sizing-2x-small: var(--dimension-6x); @@ -615,8 +618,10 @@ --typography-body-medium-underline: var(--font-weight-regular) var(--font-size-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small-underline: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-body-x-small: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-x-small-underline: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-medium: var(--dimension-5x); /** 18 px */ --typography-body-compact-large-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-large-underline-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-medium-compact: var(--font-weight-regular) var(--font-size-small)/var(--line-height-1) var(--font-family-source-sans-pro); @@ -634,12 +639,10 @@ --typography-label-medium-light: var(--font-weight-regular) var(--font-size-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small: var(--font-weight-semibold) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small-light: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); - --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-label-x-small: var(--font-weight-semibold) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-x-small-light: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --font-size-x-small: var(--dimension-4x); /** 14 px */ --font-size-small: var(--dimension-4-5x); /** 16 px */ - --font-size-medium: var(--dimension-5x); /** 18 px */ --font-size-large: var(--dimension-6x); /** 20 px */ --font-size-x-large: var(--dimension-8x); /** 24 px */ --font-size-2x-large: var(--dimension-10x); /** 32 px */ diff --git a/public/css/varsom.css b/public/css/varsom.css index 0f486ba9..46f66889 100644 --- a/public/css/varsom.css +++ b/public/css/varsom.css @@ -570,6 +570,9 @@ --spacing-content-margin-top: var(--spacing-40x); --spacing-content-margin-bottom: var(--spacing-88x); --spacing-content-margin-left-right: var(--spacing-48x); + --spacing-fixed-spacing-small: var(--dimension-4x); + --spacing-fixed-spacing-medium: var(--dimension-6x); + --spacing-fixed-spacing-large: var(--dimension-10x); --sizing-4x-small: var(--dimension-2x); --sizing-3x-small: var(--dimension-4x); --sizing-2x-small: var(--dimension-6x); @@ -615,8 +618,10 @@ --typography-body-medium-underline: var(--font-weight-regular) var(--font-size-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-small-underline: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-body-x-small: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); --typography-body-x-small-underline: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-5) var(--font-family-source-sans-pro); + --font-size-medium: var(--dimension-5x); /** 18 px */ --typography-body-compact-large-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-large-underline-compact: var(--font-weight-regular) var(--font-size-medium)/var(--line-height-1) var(--font-family-source-sans-pro); --typography-body-compact-medium-compact: var(--font-weight-regular) var(--font-size-small)/var(--line-height-1) var(--font-family-source-sans-pro); @@ -634,12 +639,10 @@ --typography-label-medium-light: var(--font-weight-regular) var(--font-size-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small: var(--font-weight-semibold) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-small-light: var(--font-weight-regular) var(--font-size-x-small)/var(--line-height-6) var(--font-family-source-sans-pro); - --font-size-2x-small: var(--dimension-3-5x); /** 12 px */ --typography-label-x-small: var(--font-weight-semibold) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --typography-label-x-small-light: var(--font-weight-regular) var(--font-size-2x-small)/var(--line-height-6) var(--font-family-source-sans-pro); --font-size-x-small: var(--dimension-4x); /** 14 px */ --font-size-small: var(--dimension-4-5x); /** 16 px */ - --font-size-medium: var(--dimension-5x); /** 18 px */ --font-size-large: var(--dimension-6x); /** 20 px */ --font-size-x-large: var(--dimension-8x); /** 24 px */ --font-size-2x-large: var(--dimension-10x); /** 32 px */