@siemens/element-theme 51.0.0-rc.7 → 51.0.0-rc.8

package/src/styles/mixins/_utilities.scss

@@ -0,0 +1,259 @@
+@use '../variables/system-tokens' as tokens;
+
+// This file currently diverges from its original by add !important everywhere.
+// stylelint-disable declaration-no-important
+
+@mixin background-utilities($prefix: 'background-') {
+  .#{$prefix}0 {
+    background-color: tokens.$si-sys-background-0 !important;
+  }
+  .#{$prefix}1 {
+    background-color: tokens.$si-sys-background-1 !important;
+  }
+  .#{$prefix}2 {
+    background-color: tokens.$si-sys-background-2 !important;
+  }
+  .#{$prefix}3 {
+    background-color: tokens.$si-sys-background-3 !important;
+  }
+  .#{$prefix}4 {
+    background-color: tokens.$si-sys-background-4 !important;
+  }
+  .#{$prefix}accent {
+    background-color: tokens.$si-sys-background-accent !important;
+  }
+  .#{$prefix}accent-active {
+    background-color: tokens.$si-sys-background-accent-active !important;
+  }
+  .#{$prefix}accent-hover {
+    background-color: tokens.$si-sys-background-accent-hover !important;
+  }
+  .#{$prefix}accent-secondary {
+    background-color: tokens.$si-sys-background-accent-secondary !important;
+  }
+  .#{$prefix}accent-secondary-active {
+    background-color: tokens.$si-sys-background-accent-secondary-active !important;
+  }
+  .#{$prefix}accent-secondary-hover {
+    background-color: tokens.$si-sys-background-accent-secondary-hover !important;
+  }
+  .#{$prefix}caution {
+    background-color: tokens.$si-sys-background-caution !important;
+  }
+  .#{$prefix}caution-active {
+    background-color: tokens.$si-sys-background-caution-active !important;
+  }
+  .#{$prefix}caution-hover {
+    background-color: tokens.$si-sys-background-caution-hover !important;
+  }
+  .#{$prefix}caution-subtle {
+    background-color: tokens.$si-sys-background-caution-subtle !important;
+  }
+  .#{$prefix}critical {
+    background-color: tokens.$si-sys-background-critical !important;
+  }
+  .#{$prefix}critical-active {
+    background-color: tokens.$si-sys-background-critical-active !important;
+  }
+  .#{$prefix}critical-hover {
+    background-color: tokens.$si-sys-background-critical-hover !important;
+  }
+  .#{$prefix}critical-subtle {
+    background-color: tokens.$si-sys-background-critical-subtle !important;
+  }
+  .#{$prefix}danger {
+    background-color: tokens.$si-sys-background-danger !important;
+  }
+  .#{$prefix}danger-active {
+    background-color: tokens.$si-sys-background-danger-active !important;
+  }
+  .#{$prefix}danger-hover {
+    background-color: tokens.$si-sys-background-danger-hover !important;
+  }
+  .#{$prefix}danger-secondary {
+    background-color: tokens.$si-sys-background-danger-secondary !important;
+  }
+  .#{$prefix}danger-subtle {
+    background-color: tokens.$si-sys-background-danger-subtle !important;
+  }
+  .#{$prefix}hover {
+    background-color: tokens.$si-sys-background-hover !important;
+  }
+  .#{$prefix}information {
+    background-color: tokens.$si-sys-background-information !important;
+  }
+  .#{$prefix}information-active {
+    background-color: tokens.$si-sys-background-information-active !important;
+  }
+  .#{$prefix}information-hover {
+    background-color: tokens.$si-sys-background-information-hover !important;
+  }
+  .#{$prefix}information-subtle {
+    background-color: tokens.$si-sys-background-information-subtle !important;
+  }
+  .#{$prefix}inverse {
+    background-color: tokens.$si-sys-background-inverse !important;
+  }
+  .#{$prefix}neutral {
+    background-color: tokens.$si-sys-background-neutral !important;
+  }
+  .#{$prefix}success {
+    background-color: tokens.$si-sys-background-success !important;
+  }
+  .#{$prefix}success-active {
+    background-color: tokens.$si-sys-background-success-active !important;
+  }
+  .#{$prefix}success-hover {
+    background-color: tokens.$si-sys-background-success-hover !important;
+  }
+  .#{$prefix}success-subtle {
+    background-color: tokens.$si-sys-background-success-subtle !important;
+  }
+  .#{$prefix}warning {
+    background-color: tokens.$si-sys-background-warning !important;
+  }
+  .#{$prefix}warning-active {
+    background-color: tokens.$si-sys-background-warning-active !important;
+  }
+  .#{$prefix}warning-hover {
+    background-color: tokens.$si-sys-background-warning-hover !important;
+  }
+  .#{$prefix}warning-secondary {
+    background-color: tokens.$si-sys-background-warning-secondary !important;
+  }
+  .#{$prefix}warning-subtle {
+    background-color: tokens.$si-sys-background-warning-subtle !important;
+  }
+}
+
+@mixin text-utilities($prefix: 'text-') {
+  .#{$prefix}accent {
+    color: tokens.$si-sys-text-accent !important;
+  }
+  .#{$prefix}accent-active {
+    color: tokens.$si-sys-text-accent-active !important;
+  }
+  .#{$prefix}accent-hover {
+    color: tokens.$si-sys-text-accent-hover !important;
+  }
+  .#{$prefix}caution {
+    color: tokens.$si-sys-text-caution !important;
+  }
+  .#{$prefix}critical {
+    color: tokens.$si-sys-text-critical !important;
+  }
+  .#{$prefix}danger {
+    color: tokens.$si-sys-text-danger !important;
+  }
+  .#{$prefix}disabled {
+    color: tokens.$si-sys-text-disabled !important;
+  }
+  .#{$prefix}information {
+    color: tokens.$si-sys-text-information !important;
+  }
+  .#{$prefix}inverse {
+    color: tokens.$si-sys-text-inverse !important;
+  }
+  .#{$prefix}on-accent {
+    color: tokens.$si-sys-text-on-accent !important;
+  }
+  .#{$prefix}on-accent-secondary {
+    color: tokens.$si-sys-text-on-accent-secondary !important;
+  }
+  .#{$prefix}on-accent-secondary-active {
+    color: tokens.$si-sys-text-on-accent-secondary-active !important;
+  }
+  .#{$prefix}on-accent-secondary-hover {
+    color: tokens.$si-sys-text-on-accent-secondary-hover !important;
+  }
+  .#{$prefix}on-caution {
+    color: tokens.$si-sys-text-on-caution !important;
+  }
+  .#{$prefix}on-critical {
+    color: tokens.$si-sys-text-on-critical !important;
+  }
+  .#{$prefix}on-danger {
+    color: tokens.$si-sys-text-on-danger !important;
+  }
+  .#{$prefix}on-danger-secondary {
+    color: tokens.$si-sys-text-on-danger-secondary !important;
+  }
+  .#{$prefix}on-information {
+    color: tokens.$si-sys-text-on-information !important;
+  }
+  .#{$prefix}on-success {
+    color: tokens.$si-sys-text-on-success !important;
+  }
+  .#{$prefix}on-warning {
+    color: tokens.$si-sys-text-on-warning !important;
+  }
+  .#{$prefix}on-warning-secondary {
+    color: tokens.$si-sys-text-on-warning-secondary !important;
+  }
+  .#{$prefix}primary {
+    color: tokens.$si-sys-text-primary !important;
+  }
+  .#{$prefix}secondary {
+    color: tokens.$si-sys-text-secondary !important;
+  }
+  .#{$prefix}success {
+    color: tokens.$si-sys-text-success !important;
+  }
+  .#{$prefix}warning {
+    color: tokens.$si-sys-text-warning !important;
+  }
+}
+
+@mixin border-utilities($prefix: 'border-') {
+  .#{$prefix}1 {
+    border-color: tokens.$si-sys-border-1 !important;
+  }
+  .#{$prefix}2 {
+    border-color: tokens.$si-sys-border-2 !important;
+  }
+  .#{$prefix}3 {
+    border-color: tokens.$si-sys-border-3 !important;
+  }
+  .#{$prefix}4 {
+    border-color: tokens.$si-sys-border-4 !important;
+  }
+  .#{$prefix}accent {
+    border-color: tokens.$si-sys-border-accent !important;
+  }
+  .#{$prefix}accent-active {
+    border-color: tokens.$si-sys-border-accent-active !important;
+  }
+  .#{$prefix}accent-hover {
+    border-color: tokens.$si-sys-border-accent-hover !important;
+  }
+  .#{$prefix}caution {
+    border-color: tokens.$si-sys-border-caution !important;
+  }
+  .#{$prefix}critical {
+    border-color: tokens.$si-sys-border-critical !important;
+  }
+  .#{$prefix}danger {
+    border-color: tokens.$si-sys-border-danger !important;
+  }
+  .#{$prefix}danger-secondary {
+    border-color: tokens.$si-sys-border-danger-secondary !important;
+  }
+  .#{$prefix}information {
+    border-color: tokens.$si-sys-border-information !important;
+  }
+  .#{$prefix}inverse {
+    border-color: tokens.$si-sys-border-inverse !important;
+  }
+  .#{$prefix}neutral {
+    border-color: tokens.$si-sys-border-neutral !important;
+  }
+  .#{$prefix}success {
+    border-color: tokens.$si-sys-border-success !important;
+  }
+  .#{$prefix}warning {
+    border-color: tokens.$si-sys-border-warning !important;
+  }
+  .#{$prefix}warning-secondary {
+    border-color: tokens.$si-sys-border-warning-secondary !important;
+  }
+}

package/src/styles/variables/_si-vars.scss

@@ -1,21 +1,27 @@
 @use 'sass:map';
 @use './spacers';
+@use './sizing';
 @use './animations';
 
 // Custom variables
 $si-caret-transition-duration: animations.element-transition-duration(0.4s);
-$si-icon-font-size: 1.25rem;
-$si-icon-font-size-sm: 1rem;
-$si-icon-font-size-lg: 1.5rem;
 
-$btn-width-normal: 80px;
+// Icon sizes
+$si-icon-font-size-sm: var(--si-sys-sizing-icon-sm);
+$si-icon-font-size-md: var(--si-sys-sizing-icon-md);
+$si-icon-font-size: $si-icon-font-size-md;
+$si-icon-font-size-lg: var(--si-sys-sizing-icon-lg);
+$si-icon-font-size-xl: var(--si-sys-sizing-icon-xl);
+$si-icon-font-size-xxl: var(--si-sys-sizing-icon-xxl);
+
+$btn-width-normal: map.get(sizing.$sizing, 120);
 
 // Component styling
 
-$si-application-header-height: calc(1.5rem + (2 * map.get(spacers.$spacers, 5) + 1px));
-$si-titlebar-padding-y: map.get(spacers.$spacers, 3);
+$si-application-header-height: calc(map.get(sizing.$sizing, 100) + 1px);
+$si-titlebar-padding-y: map.get(spacers.$spacers-block, 3);
 $si-titlebar-height: calc(1.5rem + 2 * $si-titlebar-padding-y);
-$si-system-banner-padding-y: map.get(spacers.$spacers, 1);
+$si-system-banner-padding-y: map.get(spacers.$spacers-block, 1);
 $si-system-banner-height: calc(1rem + 2 * $si-system-banner-padding-y);
 
 // allows adding a custom titlebar on top

package/src/styles/variables/_sizing.scss

@@ -0,0 +1,22 @@
+$sizing: (
+  10: var(--si-sys-sizing-sizing-10),
+  20: var(--si-sys-sizing-sizing-20),
+  30: var(--si-sys-sizing-sizing-30),
+  40: var(--si-sys-sizing-sizing-40),
+  50: var(--si-sys-sizing-sizing-50),
+  60: var(--si-sys-sizing-sizing-60),
+  70: var(--si-sys-sizing-sizing-70),
+  80: var(--si-sys-sizing-sizing-80),
+  90: var(--si-sys-sizing-sizing-90),
+  100: var(--si-sys-sizing-sizing-100),
+  110: var(--si-sys-sizing-sizing-110),
+  120: var(--si-sys-sizing-sizing-120),
+  130: var(--si-sys-sizing-sizing-130),
+  140: var(--si-sys-sizing-sizing-140),
+  150: var(--si-sys-sizing-sizing-150),
+  160: var(--si-sys-sizing-sizing-160),
+  170: var(--si-sys-sizing-sizing-170),
+  180: var(--si-sys-sizing-sizing-180),
+  190: var(--si-sys-sizing-sizing-190),
+  200: var(--si-sys-sizing-sizing-200)
+);

package/src/styles/variables/_spacers.scss

@@ -1,28 +1,56 @@
-$spacer: 16px;
+@use 'sass:map';
 
-// stylelint-disable-next-line scss/dollar-variable-default
-$spacers: (
+$spacers-inline: (
   0: 0,
-  // 2px
-  1: $spacer * 0.125,
-  // 4px
-  2: $spacer * 0.25,
-  // 6px
-  3: $spacer * 0.375,
-  // 8px
-  4: $spacer * 0.5,
-  // 12px
-  5: $spacer * 0.75,
-  // 16px
-  6: $spacer,
-  // 20px
-  7: $spacer * 1.25,
-  // 24px
-  8: $spacer * 1.5,
-  // 32px
-  9: $spacer * 2,
-  // 64px
-  10: $spacer * 4,
-  // 96px
-  11: $spacer * 6
+  1: var(--si-sys-sizing-spacing-x-10),
+  2: var(--si-sys-sizing-spacing-x-20),
+  3: var(--si-sys-sizing-spacing-x-30),
+  4: var(--si-sys-sizing-spacing-x-40),
+  5: var(--si-sys-sizing-spacing-x-50),
+  6: var(--si-sys-sizing-spacing-x-60),
+  7: var(--si-sys-sizing-spacing-x-70),
+  8: var(--si-sys-sizing-spacing-x-80),
+  9: var(--si-sys-sizing-spacing-x-90),
+  10: var(--si-sys-sizing-spacing-x-100),
+  11: var(--si-sys-sizing-spacing-x-110),
+  12: var(--si-sys-sizing-spacing-x-120),
+  13: var(--si-sys-sizing-spacing-x-130),
+  14: var(--si-sys-sizing-spacing-x-140)
 );
+
+$spacers-block: (
+  0: 0,
+  1: var(--si-sys-sizing-spacing-y-10),
+  2: var(--si-sys-sizing-spacing-y-20),
+  3: var(--si-sys-sizing-spacing-y-30),
+  4: var(--si-sys-sizing-spacing-y-40),
+  5: var(--si-sys-sizing-spacing-y-50),
+  6: var(--si-sys-sizing-spacing-y-60),
+  7: var(--si-sys-sizing-spacing-y-70),
+  8: var(--si-sys-sizing-spacing-y-80),
+  9: var(--si-sys-sizing-spacing-y-90),
+  10: var(--si-sys-sizing-spacing-y-100),
+  11: var(--si-sys-sizing-spacing-y-110),
+  12: var(--si-sys-sizing-spacing-y-120),
+  13: var(--si-sys-sizing-spacing-y-130),
+  14: var(--si-sys-sizing-spacing-y-140)
+);
+
+@function negative-spacer-map($spacers) {
+  $negative-spacers: ();
+
+  @each $key, $spacer in $spacers {
+    @if $key != 0 {
+      $negative-spacers: map.set($negative-spacers, $key, calc(#{$spacer} * -1));
+    }
+  }
+
+  @return $negative-spacers;
+}
+
+$negative-spacers-inline: negative-spacer-map($spacers-inline);
+$negative-spacers-block: negative-spacer-map($spacers-block);
+
+// @deprecated: Those are for compatibility and will go away with v52
+$spacer: 16px;
+$spacers: $spacers-block;

package/src/styles/variables/_typography.scss

@@ -11,7 +11,7 @@
 }
 
 @function px-to-ratio($base, $value) {
-  $ratio: math.div($value, $base * 16px);
+  $ratio: math.div($value, $base);
   @return math.div($ratio, $ratio * 0 + 1);
 }
 
@@ -22,102 +22,135 @@ $si-font-weight-lighter: lighter !default;
 $si-font-weight-light: 300 !default;
 $si-font-weight-normal: 400 !default;
 $si-font-weight-medium: 500 !default;
-$si-font-weight-semibold: 600 !default;
+$si-font-weight-sbold: 600 !default;
+// DEPRECATED: Use $si-font-weight-sbold instead.
+$si-font-weight-semibold: $si-font-weight-sbold !default;
 $si-font-weight-bold: 700 !default;
 $si-font-weight-bolder: bolder !default;
 $si-font-weight-black: 900 !default;
 
-$si-font-size-h1-bold: px-to-rem(28px);
-$si-line-height-h1-bold: px-to-ratio($si-font-size-h1-bold, 36px);
-$si-font-weight-h1-bold: $si-font-weight-bold;
+$si-font-size-h1: var(--si-sys-typography-font-size-h1);
+$si-line-height-h1: var(--si-sys-typography-line-height-h1);
+$si-font-weight-h1: $si-font-weight-sbold;
 
-$si-font-size-h1: px-to-rem(28px);
-$si-line-height-h1: px-to-ratio($si-font-size-h1, 36px);
-$si-font-weight-h1: $si-font-weight-normal;
+$si-font-size-h1-bold: $si-font-size-h1;
+$si-line-height-h1-bold: $si-line-height-h1;
+$si-font-weight-h1-bold: $si-font-weight-bold;
 
-$si-font-size-h2: px-to-rem(24px);
-$si-line-height-h2: px-to-ratio($si-font-size-h2, 32px);
-$si-font-weight-h2: $si-font-weight-semibold;
+$si-font-size-h2: var(--si-sys-typography-font-size-h2);
+$si-line-height-h2: var(--si-sys-typography-line-height-h2);
+$si-font-weight-h2: $si-font-weight-sbold;
 
-$si-font-size-h3: px-to-rem(20px);
-$si-line-height-h3: px-to-ratio($si-font-size-h3, 24px);
-$si-font-weight-h3: $si-font-weight-semibold;
+$si-font-size-h3: var(--si-sys-typography-font-size-h3);
+$si-line-height-h3: var(--si-sys-typography-line-height-h3);
+$si-font-weight-h3: $si-font-weight-sbold;
 
-$si-font-size-h4: px-to-rem(16px);
-$si-line-height-h4: px-to-ratio($si-font-size-h4, 20px);
-$si-font-weight-h4: $si-font-weight-semibold;
+$si-font-size-h4: var(--si-sys-typography-font-size-h4);
+$si-line-height-h4: var(--si-sys-typography-line-height-h4);
+$si-font-weight-h4: $si-font-weight-sbold;
 
-$si-font-size-h4-bold: px-to-rem(16px);
-$si-line-height-h4-bold: px-to-ratio($si-font-size-h4-bold, 20px);
+$si-font-size-h4-bold: $si-font-size-h4;
+$si-line-height-h4-bold: $si-line-height-h4;
 $si-font-weight-h4-bold: $si-font-weight-bold;
 
-$si-font-size-h5: px-to-rem(14px);
-$si-line-height-h5: px-to-ratio($si-font-size-h5, 20px);
-$si-font-weight-h5: $si-font-weight-semibold;
+$si-font-size-h5: var(--si-sys-typography-font-size-h5);
+$si-line-height-h5: var(--si-sys-typography-line-height-h5);
+$si-font-weight-h5: $si-font-weight-sbold;
 
-$si-font-size-h5-bold: px-to-rem(14px);
-$si-line-height-h5-bold: px-to-ratio($si-font-size-h5-bold, 20px);
+$si-font-size-h5-bold: $si-font-size-h5;
+$si-line-height-h5-bold: $si-line-height-h5;
 $si-font-weight-h5-bold: $si-font-weight-bold;
 
-$si-font-size-h6: px-to-rem(12px);
-$si-line-height-h6: px-to-ratio($si-font-size-h6, 16px);
-$si-font-weight-h6: $si-font-weight-semibold;
+$si-font-size-h6: var(--si-sys-typography-font-size-h6);
+$si-line-height-h6: var(--si-sys-typography-line-height-h6);
+$si-font-weight-h6: $si-font-weight-sbold;
 
-$si-font-size-body-lg: px-to-rem(16px);
-$si-line-height-body-lg: px-to-ratio($si-font-size-body-lg, 20px);
+$si-font-size-body-lg: var(--si-sys-typography-font-size-body-lg);
+$si-line-height-body-lg: var(--si-sys-typography-line-height-body-lg);
 $si-font-weight-body-lg: $si-font-weight-normal;
 
-$si-font-size-body-lg-bold: px-to-rem(16px);
-$si-line-height-body-lg-bold: px-to-ratio($si-font-size-body-lg-bold, 20px);
-$si-font-weight-body-lg-bold: $si-font-weight-semibold;
+$si-font-size-body-lg-bold: var(--si-sys-typography-font-size-body-lg);
+$si-line-height-body-lg-bold: $si-line-height-body-lg;
+$si-font-weight-body-lg-bold: $si-font-weight-sbold;
+
+$si-font-size-body-lg-sbold: $si-font-size-body-lg;
+$si-line-height-body-lg-sbold: $si-line-height-body-lg;
+$si-font-weight-body-lg-sbold: $si-font-weight-sbold;
 
-$si-font-size-body: px-to-rem(14px);
-$si-line-height-body: px-to-ratio($si-font-size-body, 16px);
-$si-line-height-body-rem: px-to-rem(16px);
+$si-font-size-body: var(--si-sys-typography-font-size-body);
+$si-line-height-body: var(--si-sys-typography-line-height-body);
 $si-font-weight-body: $si-font-weight-normal;
 
-$si-font-size-body-paragraph: px-to-rem(14px);
-$si-line-height-body-paragraph: px-to-ratio($si-font-size-body-paragraph, 20px);
+$si-font-size-body-sbold: $si-font-size-body;
+$si-line-height-body-sbold: $si-line-height-body;
+$si-font-weight-body-sbold: $si-font-weight-sbold;
+
+$si-font-size-body-paragraph: var(--si-sys-typography-font-size-body-paragraph);
+$si-line-height-body-paragraph: var(--si-sys-typography-line-height-body-paragraph);
 $si-font-weight-body-paragraph: $si-font-weight-normal;
 
-$si-font-size-body-sm: px-to-rem(12px);
-$si-line-height-body-sm: px-to-ratio($si-font-size-body-sm, 16px);
+$si-font-size-body-paragraph-sbold: $si-font-size-body-paragraph;
+$si-line-height-body-paragraph-sbold: $si-line-height-body-paragraph;
+$si-font-weight-body-paragraph-sbold: $si-font-weight-sbold;
+
+$si-font-size-body-sm: var(--si-sys-typography-font-size-body-sm);
+$si-line-height-body-sm: var(--si-sys-typography-line-height-body-sm);
 $si-font-weight-body-sm: $si-font-weight-normal;
 
+$si-font-size-body-sm-sbold: $si-font-size-body-sm;
+$si-line-height-body-sm-sbold: $si-line-height-body-sm;
+$si-font-weight-body-sm-sbold: $si-font-weight-sbold;
+
 $si-font-size-caption: $si-font-size-body-sm;
 $si-line-height-caption: $si-line-height-body-sm;
 $si-font-weight-caption: $si-font-weight-normal;
 
-$si-font-size-display-xxl: px-to-rem(58px);
-$si-line-height-display-xxl: px-to-ratio($si-font-size-display-xxl, 72px);
+$si-font-size-display-xxl: var(--si-sys-typography-font-size-display-xxl);
+$si-line-height-display-xxl: var(--si-sys-typography-line-height-display-xxl);
 $si-font-weight-display-xxl: $si-font-weight-normal;
 
-$si-font-size-display-xl: px-to-rem(48px);
-$si-line-height-display-xl: px-to-ratio($si-font-size-display-xl, 64px);
+$si-font-size-display-xxl-sbold: $si-font-size-display-xxl;
+$si-line-height-display-xxl-sbold: $si-line-height-display-xxl;
+$si-font-weight-display-xxl-sbold: $si-font-weight-sbold;
+
+$si-font-size-display-xl: var(--si-sys-typography-font-size-display-xl);
+$si-line-height-display-xl: var(--si-sys-typography-line-height-display-xl);
 $si-font-weight-display-xl: $si-font-weight-normal;
 
-$si-font-size-display-lg: px-to-rem(40px);
-$si-line-height-display-lg: px-to-ratio($si-font-size-display-lg, 52px);
+$si-font-size-display-xl-sbold: $si-font-size-display-xl;
+$si-line-height-display-xl-sbold: $si-line-height-display-xl;
+$si-font-weight-display-xl-sbold: $si-font-weight-sbold;
+
+$si-font-size-display-lg: var(--si-sys-typography-font-size-display-lg);
+$si-line-height-display-lg: var(--si-sys-typography-line-height-display-lg);
 $si-font-weight-display-lg: $si-font-weight-normal;
 
+$si-font-size-display-lg-sbold: $si-font-size-display-lg;
+$si-line-height-display-lg-sbold: $si-line-height-display-lg;
+$si-font-weight-display-lg-sbold: $si-font-weight-sbold;
+
 $si-font-size-display-bold: $si-font-size-display-lg;
 $si-line-height-display-bold: $si-line-height-display-lg;
 $si-font-weight-display-bold: $si-font-weight-bold;
 
-$si-font-size-display: px-to-rem(32px);
-$si-line-height-display: px-to-ratio($si-font-size-display, 40px);
+$si-font-size-display: var(--si-sys-typography-font-size-display);
+$si-line-height-display: var(--si-sys-typography-line-height-display);
 $si-font-weight-display: $si-font-weight-normal;
 
-$si-font-size-code-sm: px-to-rem(12px);
-$si-line-height-code-sm: px-to-ratio($si-font-size-code-sm, 16px);
+$si-font-size-display-sbold: $si-font-size-display;
+$si-line-height-display-sbold: $si-line-height-display;
+$si-font-weight-display-sbold: $si-font-weight-sbold;
+
+$si-font-size-code-sm: var(--si-sys-typography-font-size-code-sm);
+$si-line-height-code-sm: var(--si-sys-typography-line-height-code-sm);
 $si-font-weight-code-sm: $si-font-weight-normal;
 
-$si-font-size-code: px-to-rem(14px);
-$si-line-height-code: px-to-ratio($si-font-size-code, 20px);
+$si-font-size-code: var(--si-sys-typography-font-size-code);
+$si-line-height-code: var(--si-sys-typography-line-height-code);
 $si-font-weight-code: $si-font-weight-normal;
 
-$si-font-size-code-lg: px-to-rem(16px);
-$si-line-height-code-lg: px-to-ratio($si-font-size-code-lg, 20px);
+$si-font-size-code-lg: var(--si-sys-typography-font-size-code-lg);
+$si-line-height-code-lg: var(--si-sys-typography-line-height-code-lg);
 $si-font-weight-code-lg: $si-font-weight-normal;
 
 $si-letter-spacing-normal: 0;