@fremtind/jokul 5.0.0-next.0 → 5.0.0-next.2

package/styles/{core/jkl → jkl}/_motion.scss

@@ -1,46 +1,28 @@
 @use "sass:map";
 @use "sass:list";
-
-// Oppdater verdier i motion.ts også
-$_easings: (
-    "standard": ease,
-    "entrance": ease-out,
-    "exit": ease-in,
-    "easeInBounceOut": cubic-bezier(0, 0, 0.375, 1.17),
-    "focus": cubic-bezier(0.6, 0.2, 0.35, 1),
-);
+@use "tokens" as *;
 
 /// Hent en easing til bruk i animasjoner. Se også `timing`-funksjonen og `motion`-mixinen.
-/// @param {"standard" | "entrance" | "exit" | "easeInBounceOut" | "focus"} $name - Navn på easingen du ønsker verdien til
+/// @param {string} $name - Navn på easingen du ønsker verdien til
 /// @return {String} - easingverdi til bruk i animasjoner
 /// @see timing
 /// @see motion
-@function easing($name, $easings: $_easings) {
-    @if map.has-key($easings, $name) {
-        @return map.get($easings, $name);
+@function easing($name) {
+    @if map.has-key($tokens, "motion", "easing", $name) {
+        @return map.get($tokens, "motion", "easing", $name);
     } @else {
         @error 'Unable to find an easing named #{$name} in our supported easings.';
     }
 }
 
-// Oppdater verdier i motion.ts også
-$_timings: (
-    "energetic": 75ms,
-    "snappy": 100ms,
-    "productive": 150ms,
-    "polite": 200ms,
-    "expressive": 250ms,
-    "lazy": 400ms,
-);
-
 /// Hent en timing til bruk i animasjoner. Se også `easing`-funksjonen og `motion`-mixinen.
 /// @param {"energetic" | "snappy" | "productive" | "expressive" | "lazy"} $mode - Navn på timingen du ønsker verdien til
 /// @return {String} - timingverdi til bruk i animasjoner
 /// @see easing
 /// @see motion
-@function timing($mode, $timings: $_timings) {
-    @if map.has-key($timings, $mode) {
-        @return map.get($timings, $mode);
+@function timing($mode) {
+    @if map.has-key($tokens, "motion", "timing", $mode) {
+        @return map.get($tokens, "motion", "timing", $mode);
     } @else {
         @error 'Unable to find a timing named #{$mode} in our supported timings';
     }

package/styles/{core/jkl → jkl}/_ornaments.scss

@@ -23,6 +23,6 @@
 }
 
 @mixin focus-outline($offset: 3px, $thickness: 3px) {
-    outline: $thickness solid var(--jkl-color-border-action);
+    outline: $thickness solid var(--jkl-color-border-strong);
     outline-offset: $offset;
 }

package/styles/{core/jkl → jkl}/_reset.scss

@@ -1,4 +1,4 @@
-@use "theme";
+@use "forced-colors";
 
 /// En omfattende reset for alt av outlines og borders på interaktive elementer
 @mixin reset-outline {
@@ -17,7 +17,7 @@
 
     // Reset alt som er gjort over hvis brukeren har på forced-colors.
     // Da mister vi box-shadow og er avhengig av at borders og outlines synes.
-    @include theme.forced-colors-mode {
+    @include forced-colors.forced-colors-mode {
         outline: revert;
         border-style: revert;
         outline-style: revert;

package/styles/{core/jkl → jkl}/_spacing.scss

@@ -2,11 +2,6 @@
 @use "sass:map";
 @use "sass:list";
 @use "screens";
-@use "legacy";
-
-/// Lar deg gjøre oppslag på navnet uten `spacing`-prefix for å få ut rem-verdien
-/// @type Map
-$spacing: map.get(legacy.$tokens, "spacing");
 
 /// Her defineres kombinasjoner av spacinger til bruk i nytteklasser for spacing.
 /// Nytteklasser for alle enkeltspacinger, samt kombinasjoner, i denne listen
@@ -146,4 +141,4 @@ $positions: (
             @include _single-spacing(list.nth($steps, 3), $position);
         }
     }
-}
+}

package/styles/jkl/_tokens.scss

@@ -0,0 +1,386 @@
+
+/**
+ * Do not edit directly, this file was auto-generated.
+ */
+
+$color-neutral-background-page: var(--jkl-color-neutral-background-page) !default;
+$color-neutral-background-container: var(--jkl-color-neutral-background-container) !default;
+$color-neutral-background-action: var(--jkl-color-neutral-background-action) !default;
+$color-neutral-text-default: var(--jkl-color-neutral-text-default) !default;
+$color-neutral-text-subdued: var(--jkl-color-neutral-text-subdued) !default;
+$color-neutral-text-on-action: var(--jkl-color-neutral-text-on-action) !default;
+$color-neutral-border-strong: var(--jkl-color-neutral-border-strong) !default;
+$color-neutral-border-default: var(--jkl-color-neutral-border-default) !default;
+$color-neutral-border-subdued: var(--jkl-color-neutral-border-subdued) !default;
+$color-accent-background-page: var(--jkl-color-accent-background-page) !default;
+$color-accent-background-container: var(--jkl-color-accent-background-container) !default;
+$color-accent-background-action: var(--jkl-color-accent-background-action) !default;
+$color-accent-text-default: var(--jkl-color-accent-text-default) !default;
+$color-accent-text-subdued: var(--jkl-color-accent-text-subdued) !default;
+$color-accent-text-on-action: var(--jkl-color-accent-text-on-action) !default;
+$color-accent-border-strong: var(--jkl-color-accent-border-strong) !default;
+$color-accent-border-default: var(--jkl-color-accent-border-default) !default;
+$color-accent-border-subdued: var(--jkl-color-accent-border-subdued) !default;
+$color-warning-background-page: var(--jkl-color-warning-background-page) !default;
+$color-warning-background-container: var(--jkl-color-warning-background-container) !default;
+$color-warning-background-action: var(--jkl-color-warning-background-action) !default;
+$color-warning-text-default: var(--jkl-color-warning-text-default) !default;
+$color-warning-text-subdued: var(--jkl-color-warning-text-subdued) !default;
+$color-warning-text-on-action: var(--jkl-color-warning-text-on-action) !default;
+$color-warning-border-strong: var(--jkl-color-warning-border-strong) !default;
+$color-warning-border-default: var(--jkl-color-warning-border-default) !default;
+$color-warning-border-subdued: var(--jkl-color-warning-border-subdued) !default;
+$color-success-background-page: var(--jkl-color-success-background-page) !default;
+$color-success-background-container: var(--jkl-color-success-background-container) !default;
+$color-success-background-action: var(--jkl-color-success-background-action) !default;
+$color-success-text-default: var(--jkl-color-success-text-default) !default;
+$color-success-text-subdued: var(--jkl-color-success-text-subdued) !default;
+$color-success-text-on-action: var(--jkl-color-success-text-on-action) !default;
+$color-success-border-strong: var(--jkl-color-success-border-strong) !default;
+$color-success-border-default: var(--jkl-color-success-border-default) !default;
+$color-success-border-subdued: var(--jkl-color-success-border-subdued) !default;
+$color-info-background-page: var(--jkl-color-info-background-page) !default;
+$color-info-background-container: var(--jkl-color-info-background-container) !default;
+$color-info-background-action: var(--jkl-color-info-background-action) !default;
+$color-info-text-default: var(--jkl-color-info-text-default) !default;
+$color-info-text-subdued: var(--jkl-color-info-text-subdued) !default;
+$color-info-text-on-action: var(--jkl-color-info-text-on-action) !default;
+$color-info-border-strong: var(--jkl-color-info-border-strong) !default;
+$color-info-border-default: var(--jkl-color-info-border-default) !default;
+$color-info-border-subdued: var(--jkl-color-info-border-subdued) !default;
+$color-error-background-page: var(--jkl-color-error-background-page) !default;
+$color-error-background-container: var(--jkl-color-error-background-container) !default;
+$color-error-background-action: var(--jkl-color-error-background-action) !default;
+$color-error-text-default: var(--jkl-color-error-text-default) !default;
+$color-error-text-subdued: var(--jkl-color-error-text-subdued) !default;
+$color-error-text-on-action: var(--jkl-color-error-text-on-action) !default;
+$color-error-border-strong: var(--jkl-color-error-border-strong) !default;
+$color-error-border-default: var(--jkl-color-error-border-default) !default;
+$color-error-border-subdued: var(--jkl-color-error-border-subdued) !default;
+$unit-0: var(--jkl-unit-0) !default;
+$unit-10: var(--jkl-unit-10) !default;
+$unit-15: var(--jkl-unit-15) !default;
+$unit-20: var(--jkl-unit-20) !default;
+$unit-25: var(--jkl-unit-25) !default;
+$unit-30: var(--jkl-unit-30) !default;
+$unit-35: var(--jkl-unit-35) !default;
+$unit-40: var(--jkl-unit-40) !default;
+$unit-50: var(--jkl-unit-50) !default;
+$unit-60: var(--jkl-unit-60) !default;
+$unit-70: var(--jkl-unit-70) !default;
+$unit-80: var(--jkl-unit-80) !default;
+$unit-90: var(--jkl-unit-90) !default;
+$unit-100: var(--jkl-unit-100) !default;
+$unit-130: var(--jkl-unit-130) !default;
+$unit-210: var(--jkl-unit-210) !default;
+$unit-base: var(--jkl-unit-base) !default;
+$unit-02: var(--jkl-unit-02) !default;
+$unit-05: var(--jkl-unit-05) !default;
+$spacing-0: var(--jkl-spacing-0) !default;
+$spacing-2: var(--jkl-spacing-2) !default;
+$spacing-4: var(--jkl-spacing-4) !default;
+$spacing-8: var(--jkl-spacing-8) !default;
+$spacing-12: var(--jkl-spacing-12) !default;
+$spacing-16: var(--jkl-spacing-16) !default;
+$spacing-24: var(--jkl-spacing-24) !default;
+$spacing-32: var(--jkl-spacing-32) !default;
+$spacing-40: var(--jkl-spacing-40) !default;
+$spacing-64: var(--jkl-spacing-64) !default;
+$spacing-104: var(--jkl-spacing-104) !default;
+$spacing-168: var(--jkl-spacing-168) !default;
+$spacing-none: var(--jkl-spacing-none) !default;
+$spacing-2xs: var(--jkl-spacing-2xs) !default;
+$spacing-xs: var(--jkl-spacing-xs) !default;
+$spacing-s: var(--jkl-spacing-s) !default;
+$spacing-m: var(--jkl-spacing-m) !default;
+$spacing-l: var(--jkl-spacing-l) !default;
+$spacing-xl: var(--jkl-spacing-xl) !default;
+$spacing-2xl: var(--jkl-spacing-2xl) !default;
+$border-width-1: var(--jkl-border-width-1) !default;
+$border-width-2: var(--jkl-border-width-2) !default;
+$border-width-3: var(--jkl-border-width-3) !default;
+$border-radius-none: var(--jkl-border-radius-none) !default;
+$border-radius-xs: var(--jkl-border-radius-xs) !default;
+$border-radius-s: var(--jkl-border-radius-s) !default;
+$border-radius-m: var(--jkl-border-radius-m) !default;
+$border-radius-l: var(--jkl-border-radius-l) !default;
+$border-radius-full: var(--jkl-border-radius-full) !default;
+$breakpoint-small: var(--jkl-breakpoint-small) !default;
+$breakpoint-medium: var(--jkl-breakpoint-medium) !default;
+$breakpoint-large: var(--jkl-breakpoint-large) !default;
+$breakpoint-xl: var(--jkl-breakpoint-xl) !default;
+$motion-timing-energetic: var(--jkl-motion-timing-energetic) !default;
+$motion-timing-snappy: var(--jkl-motion-timing-snappy) !default;
+$motion-timing-productive: var(--jkl-motion-timing-productive) !default;
+$motion-timing-polite: var(--jkl-motion-timing-polite) !default;
+$motion-timing-expressive: var(--jkl-motion-timing-expressive) !default;
+$motion-timing-lazy: var(--jkl-motion-timing-lazy) !default;
+$motion-easing-standard: var(--jkl-motion-easing-standard) !default;
+$motion-easing-entrance: var(--jkl-motion-easing-entrance) !default;
+$motion-easing-exit: var(--jkl-motion-easing-exit) !default;
+$motion-easing-ease-in-bounce-out: var(--jkl-motion-easing-ease-in-bounce-out) !default;
+$motion-easing-focus: var(--jkl-motion-easing-focus) !default;
+$font-size-1: var(--jkl-font-size-1) !default;
+$font-size-2: var(--jkl-font-size-2) !default;
+$font-size-3: var(--jkl-font-size-3) !default;
+$font-size-4: var(--jkl-font-size-4) !default;
+$font-size-5: var(--jkl-font-size-5) !default;
+$font-size-6: var(--jkl-font-size-6) !default;
+$font-size-7: var(--jkl-font-size-7) !default;
+$font-size-8: var(--jkl-font-size-8) !default;
+$font-size-9: var(--jkl-font-size-9) !default;
+$font-size-10: var(--jkl-font-size-10) !default;
+$font-weight-normal: var(--jkl-font-weight-normal) !default;
+$font-weight-bold: var(--jkl-font-weight-bold) !default;
+$font-family-regular: var(--jkl-font-family-regular) !default;
+$font-family-display: var(--jkl-font-family-display) !default;
+$font-family-mono: var(--jkl-font-family-mono) !default;
+$line-height-flush: var(--jkl-line-height-flush) !default;
+$line-height-tight: var(--jkl-line-height-tight) !default;
+$line-height-relaxed: var(--jkl-line-height-relaxed) !default;
+$text-style-title: var(--jkl-text-style-title) !default;
+$text-style-title-small: var(--jkl-text-style-title-small) !default;
+$text-style-heading-1: var(--jkl-text-style-heading-1) !default;
+$text-style-heading-2: var(--jkl-text-style-heading-2) !default;
+$text-style-heading-3: var(--jkl-text-style-heading-3) !default;
+$text-style-heading-4: var(--jkl-text-style-heading-4) !default;
+$text-style-heading-5: var(--jkl-text-style-heading-5) !default;
+$text-style-paragraph-large: var(--jkl-text-style-paragraph-large) !default;
+$text-style-paragraph-medium: var(--jkl-text-style-paragraph-medium) !default;
+$text-style-paragraph-small: var(--jkl-text-style-paragraph-small) !default;
+$text-style-text-large: var(--jkl-text-style-text-large) !default;
+$text-style-text-medium: var(--jkl-text-style-text-medium) !default;
+$text-style-text-small: var(--jkl-text-style-text-small) !default;
+$text-style-text-micro: var(--jkl-text-style-text-micro) !default;
+
+$tokens: (
+  'color': (
+    'neutral': (
+      'background': (
+        'page': $color-neutral-background-page,
+        'container': $color-neutral-background-container,
+        'action': $color-neutral-background-action
+      ),
+      'text': (
+        'default': $color-neutral-text-default,
+        'subdued': $color-neutral-text-subdued,
+        'on-action': $color-neutral-text-on-action
+      ),
+      'border': (
+        'strong': $color-neutral-border-strong,
+        'default': $color-neutral-border-default,
+        'subdued': $color-neutral-border-subdued
+      )
+    ),
+    'accent': (
+      'background': (
+        'page': $color-accent-background-page,
+        'container': $color-accent-background-container,
+        'action': $color-accent-background-action
+      ),
+      'text': (
+        'default': $color-accent-text-default,
+        'subdued': $color-accent-text-subdued,
+        'on-action': $color-accent-text-on-action
+      ),
+      'border': (
+        'strong': $color-accent-border-strong,
+        'default': $color-accent-border-default,
+        'subdued': $color-accent-border-subdued
+      )
+    ),
+    'warning': (
+      'background': (
+        'page': $color-warning-background-page,
+        'container': $color-warning-background-container,
+        'action': $color-warning-background-action
+      ),
+      'text': (
+        'default': $color-warning-text-default,
+        'subdued': $color-warning-text-subdued,
+        'on-action': $color-warning-text-on-action
+      ),
+      'border': (
+        'strong': $color-warning-border-strong,
+        'default': $color-warning-border-default,
+        'subdued': $color-warning-border-subdued
+      )
+    ),
+    'success': (
+      'background': (
+        'page': $color-success-background-page,
+        'container': $color-success-background-container,
+        'action': $color-success-background-action
+      ),
+      'text': (
+        'default': $color-success-text-default,
+        'subdued': $color-success-text-subdued,
+        'on-action': $color-success-text-on-action
+      ),
+      'border': (
+        'strong': $color-success-border-strong,
+        'default': $color-success-border-default,
+        'subdued': $color-success-border-subdued
+      )
+    ),
+    'info': (
+      'background': (
+        'page': $color-info-background-page,
+        'container': $color-info-background-container,
+        'action': $color-info-background-action
+      ),
+      'text': (
+        'default': $color-info-text-default,
+        'subdued': $color-info-text-subdued,
+        'on-action': $color-info-text-on-action
+      ),
+      'border': (
+        'strong': $color-info-border-strong,
+        'default': $color-info-border-default,
+        'subdued': $color-info-border-subdued
+      )
+    ),
+    'error': (
+      'background': (
+        'page': $color-error-background-page,
+        'container': $color-error-background-container,
+        'action': $color-error-background-action
+      ),
+      'text': (
+        'default': $color-error-text-default,
+        'subdued': $color-error-text-subdued,
+        'on-action': $color-error-text-on-action
+      ),
+      'border': (
+        'strong': $color-error-border-strong,
+        'default': $color-error-border-default,
+        'subdued': $color-error-border-subdued
+      )
+    )
+  ),
+  'unit': (
+    '0': $unit-0,
+    '10': $unit-10,
+    '15': $unit-15,
+    '20': $unit-20,
+    '25': $unit-25,
+    '30': $unit-30,
+    '35': $unit-35,
+    '40': $unit-40,
+    '50': $unit-50,
+    '60': $unit-60,
+    '70': $unit-70,
+    '80': $unit-80,
+    '90': $unit-90,
+    '100': $unit-100,
+    '130': $unit-130,
+    '210': $unit-210,
+    'base': $unit-base,
+    '02': $unit-02,
+    '05': $unit-05
+  ),
+  'spacing': (
+    '0': $spacing-0,
+    '2': $spacing-2,
+    '4': $spacing-4,
+    '8': $spacing-8,
+    '12': $spacing-12,
+    '16': $spacing-16,
+    '24': $spacing-24,
+    '32': $spacing-32,
+    '40': $spacing-40,
+    '64': $spacing-64,
+    '104': $spacing-104,
+    '168': $spacing-168,
+    'none': $spacing-none,
+    '2xs': $spacing-2xs,
+    'xs': $spacing-xs,
+    's': $spacing-s,
+    'm': $spacing-m,
+    'l': $spacing-l,
+    'xl': $spacing-xl,
+    '2xl': $spacing-2xl
+  ),
+  'border': (
+    'width': (
+      '1': $border-width-1,
+      '2': $border-width-2,
+      '3': $border-width-3
+    ),
+    'radius': (
+      'none': $border-radius-none,
+      'xs': $border-radius-xs,
+      's': $border-radius-s,
+      'm': $border-radius-m,
+      'l': $border-radius-l,
+      'full': $border-radius-full
+    )
+  ),
+  'breakpoint': (
+    'small': $breakpoint-small,
+    'medium': $breakpoint-medium,
+    'large': $breakpoint-large,
+    'xl': $breakpoint-xl
+  ),
+  'motion': (
+    'timing': (
+      'energetic': $motion-timing-energetic,
+      'snappy': $motion-timing-snappy,
+      'productive': $motion-timing-productive,
+      'polite': $motion-timing-polite,
+      'expressive': $motion-timing-expressive,
+      'lazy': $motion-timing-lazy
+    ),
+    'easing': (
+      'standard': $motion-easing-standard,
+      'entrance': $motion-easing-entrance,
+      'exit': $motion-easing-exit,
+      'easeInBounceOut': $motion-easing-ease-in-bounce-out,
+      'focus': $motion-easing-focus
+    )
+  ),
+  'font': (
+    'size': (
+      '1': $font-size-1,
+      '2': $font-size-2,
+      '3': $font-size-3,
+      '4': $font-size-4,
+      '5': $font-size-5,
+      '6': $font-size-6,
+      '7': $font-size-7,
+      '8': $font-size-8,
+      '9': $font-size-9,
+      '10': $font-size-10
+    ),
+    'weight': (
+      'normal': $font-weight-normal,
+      'bold': $font-weight-bold
+    ),
+    'family': (
+      'regular': $font-family-regular,
+      'display': $font-family-display,
+      'mono': $font-family-mono
+    )
+  ),
+  'lineHeight': (
+    'flush': $line-height-flush,
+    'tight': $line-height-tight,
+    'relaxed': $line-height-relaxed
+  ),
+  'textStyle': (
+    'title': $text-style-title,
+    'title-small': $text-style-title-small,
+    'heading-1': $text-style-heading-1,
+    'heading-2': $text-style-heading-2,
+    'heading-3': $text-style-heading-3,
+    'heading-4': $text-style-heading-4,
+    'heading-5': $text-style-heading-5,
+    'paragraph-large': $text-style-paragraph-large,
+    'paragraph-medium': $text-style-paragraph-medium,
+    'paragraph-small': $text-style-paragraph-small,
+    'text-large': $text-style-text-large,
+    'text-medium': $text-style-text-medium,
+    'text-small': $text-style-text-small,
+    'text-micro': $text-style-text-micro
+  )
+);

package/styles/{core/jkl → jkl}/_typography.scss

@@ -3,98 +3,8 @@
 @use "sass:list";
 @use "screens";
 @use "tokens" as *;
-@use "legacy/tokens" as *;
 @use "responsive-units";
 
-/// @access private - forwardes ikke ut av modulen, men er tilgjengelig ved direkteimport. KUN FOR INTERN BRUK I JØKUL.
-$text-styles: (
-    "title": (
-        "font-size": var(--jkl-font-size-8),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "title-small": (
-        "font-size": var(--jkl-font-size-7),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "heading-1": (
-        "font-size": var(--jkl-font-size-8),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "heading-2": (
-        "font-size": var(--jkl-font-size-7),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "heading-3": (
-        "font-size": var(--jkl-font-size-6),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-bold,
-        "--jkl-icon-weight": $icon-weight-bold,
-    ),
-    "heading-4": (
-        "font-size": var(--jkl-font-size-5),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-bold,
-        "--jkl-icon-weight": $icon-weight-bold,
-    ),
-    "heading-5": (
-        "font-size": var(--jkl-font-size-4),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-bold,
-        "--jkl-icon-weight": $icon-weight-bold,
-    ),
-    "paragraph-large": (
-        "font-size": var(--jkl-font-size-5),
-        "line-height": var(--jkl-line-height-relaxed),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "paragraph-medium": (
-        "font-size": var(--jkl-font-size-3),
-        "line-height": var(--jkl-line-height-relaxed),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "paragraph-small": (
-        "font-size": var(--jkl-font-size-2),
-        "line-height": var(--jkl-line-height-relaxed),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-        "--jkl-icon-size": 1.2em,
-    ),
-    "text-large": (
-        "font-size": var(--jkl-font-size-5),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "text-medium": (
-        "font-size": var(--jkl-font-size-3),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "text-small": (
-        "font-size": var(--jkl-font-size-2),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-    "text-micro": (
-        "font-size": var(--jkl-font-size-1),
-        "line-height": var(--jkl-line-height-tight),
-        "font-weight": $typography-weight-normal,
-        "--jkl-icon-weight": $icon-weight-normal,
-    ),
-);
-
 /// Gir deg responsive font-size, line-height og font-weight basert på navnet på typografien.
 /// Du kan overstyre standardverdier ved å bruke `@content`. Dette er ment som en "escape hatch".
 /// Ikke tukle med typografiskalaen med mindre du har en god grunn til det.
@@ -107,15 +17,12 @@ $text-styles: (
 /// @example
 ///     .bold {
 ///         @include jkl.text-style("body") {
-///             font-weight: jkl.$typography-weight-bold;
+///             font-weight: jkl.$font-weight-bold;
 ///         }
 ///     }
 @mixin text-style($style) {
-    @if map.has-key($text-styles, $style) {
-        @each $property, $value in map.get($text-styles, $style) {
-            #{$property}: $value;
-        }
-
+    @if map.has-key($tokens, "textStyle", $style) {
+        font: map.get($tokens, "textStyle", $style);
         @content;
     } @else {
         @error "No text style with the name #{$style} was found. Try one of these: #{map.keys($text-styles)}";
@@ -125,8 +32,8 @@ $text-styles: (
 /// Makes text bold without changing the space it takes up on screen.
 /// Not perfect for all lengths of text, but close enough!
 @mixin no-grow-bold {
-    --jkl-icon-weight: #{$icon-weight-bold};
-    font-weight: $typography-weight-bold;
+    --jkl-icon-weight: 400;
+    font-weight: $font-weight-bold;
     letter-spacing: -0.014em;
 }
 

package/styles/shared/input/shared-input-styles.scss

@@ -1,5 +1,5 @@
 @use "sass:color";
-@use "../../core/jkl";
+@use "../../jkl";
 
 @mixin wrapper-styles {
     --jkl-text-input-padding: var(--jkl-text-input-vertical-padding)
@@ -11,8 +11,8 @@
     --jkl-text-input-action-button-padding: var(--jkl-unit-10) 0;
     --jkl-text-input-action-button-focus-position: var(--jkl-unit-05);
     --text-color: var(--jkl-color-text-default);
-    --background-color: var(--jkl-color-background-input-base);
-    --border-color: var(--jkl-color-border-input);
+    --background-color: transparent;
+    --border-color: var(--jkl-color-border-default);
     --placeholder-color: var(--jkl-color-text-subdued);
 
     border-radius: var(--jkl-border-radius-s);
@@ -35,12 +35,12 @@
 
     &:focus-within,
     &:has([data-focused="true"]) {
-        --background-color: var(--jkl-color-background-input-focus);
+        --background-color: var(--jkl-color-background-container);
     }
 
     &[data-invalid="true"]:not(:focus-within):not(:has([data-focused="true"])) {
-        --background-color: var(--jkl-color-background-alert-error);
-        --text-color: var(--jkl-color-text-on-alert);
+        --background-color: var(--jkl-color-error-background-container);
+        --text-color: var(--jkl-color-error-text-default);
         // Vi har ingen god måte å få tak i kun light mode-versjon av subdued
         // så vi bruker tekstfargen med litt gjennomsiktighet
         --placeholder-color: color(from currentColor sRGB r g b / 75%);
@@ -49,7 +49,7 @@
     &:hover,
     &:focus-within,
     &:has([data-focused="true"]) {
-        --border-color: var(--jkl-color-border-input-focus);
+        --border-color: var(--jkl-color-border-strong);
 
         box-shadow:
             inset 0 0 0 jkl.rem(1px) var(--border-color),

package/styles/shared/track/track.scss

@@ -1,8 +1,8 @@
-@use "../../core/jkl";
+@use "../../jkl";
 
 @mixin track {
-    --track-color: var(--jkl-color-border-separator);
-    --bar-color: var(--jkl-color-border-input-focus);
+    --track-color: var(--jkl-color-border-subdued);
+    --bar-color: var(--jkl-color-border-strong);
     --bar-height: #{jkl.rem(4px)};
 
     background-color: var(--track-color);