added heading font family theme property

dnbexperience · Nov 18, 2024 · 97e2637 · 97e2637
1 parent cfa3f5e
commit 97e2637
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 15 deletions.
diff --git a/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.module.scss b/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.module.scss
@@ -215,7 +215,7 @@
 
       &.dnb-sidebar-menu__theme-badge--sbanken {
         padding: 0;
-        font-family: var(--sb-font-family-headings);
+        font-family: var(--font-family-heading);
         font-weight: normal;
 
         .dnb-sidebar-menu__theme-badge__title {

diff --git a/...nb-eufemia/scripts/prebuild/tasks/__tests__/__snapshots__/makePropertiesFile.test.ts.snap b/...nb-eufemia/scripts/prebuild/tasks/__tests__/__snapshots__/makePropertiesFile.test.ts.snap
@@ -5,7 +5,7 @@ exports[`Properties for sbanken has to validate 1`] = `
 
 export default {
   '--sb-font-family-default': '"Roboto", "Helvetica", "Arial", sans-serif',
-  '--sb-font-family-headings': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
+  '--sb-font-family-heading': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
   '--sb-font-weight-default': 'normal',
   '--sb-font-weight-basis': 'normal',
   '--sb-font-weight-regular': 'normal',
@@ -97,6 +97,7 @@ export default {
   '--color-emerald-green-25': '#c4d4d6',
   '--color-emerald-green-10': '#e8eeef',
   '--font-family-default': 'var(--sb-font-family-default)',
+  '--font-family-heading': 'var(--sb-font-family-heading)',
   '--font-family-monospace': '"DNBMono", "Menlo", "Consolas", "Roboto Mono",',
   '--font-weight-default': 'normal',
   '--font-weight-basis': 'normal',
@@ -187,7 +188,7 @@ exports[`Properties for ui has to validate 1`] = `
 
 export default {
   '--sb-font-family-default': '"Roboto", "Helvetica", "Arial", sans-serif',
-  '--sb-font-family-headings': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
+  '--sb-font-family-heading': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
   '--sb-font-weight-default': 'normal',
   '--sb-font-weight-basis': 'normal',
   '--sb-font-weight-regular': 'normal',
@@ -279,6 +280,7 @@ export default {
   '--color-emerald-green-25': '#c4d4d6',
   '--color-emerald-green-10': '#e8eeef',
   '--font-family-default': '"DNB", sans-serif',
+  '--font-family-heading': 'var(--font-family-default)',
   '--font-family-monospace': '"DNBMono", "Menlo", "Consolas", "Roboto Mono",',
   '--font-weight-default': 'normal',
   '--font-weight-basis': 'normal',

diff --git a/packages/dnb-eufemia/src/components/avatar/style/themes/dnb-avatar-theme-sbanken.scss b/packages/dnb-eufemia/src/components/avatar/style/themes/dnb-avatar-theme-sbanken.scss
@@ -26,12 +26,12 @@
 
   &--size-large {
     font-weight: var(--sb-font-weight-basis);
-    font-family: var(--sb-font-family-headings);
+    font-family: var(--font-family-heading);
   }
 
   &--size-x-large {
     font-weight: var(--sb-font-weight-basis);
-    font-family: var(--sb-font-family-headings);
+    font-family: var(--font-family-heading);
   }
 
   &__group {

diff --git a/packages/dnb-eufemia/src/elements/typography/style/dnb-typography.scss b/packages/dnb-eufemia/src/elements/typography/style/dnb-typography.scss
@@ -7,7 +7,6 @@
 @import './typography-mixins.scss';
 
 @include typographySelectors() {
-  --typography-h-default-font-family: var(--font-family-default);
   --typography-h-default-font-weight: var(--font-weight-medium);
 
   // Heading xx-large

diff --git a/packages/dnb-eufemia/src/elements/typography/style/themes/dnb-typography-theme-sbanken.scss b/packages/dnb-eufemia/src/elements/typography/style/themes/dnb-typography-theme-sbanken.scss
@@ -18,7 +18,6 @@
 }
 
 @include typography.typographySelectors() {
-  --typography-h-default-font-family: var(--sb-font-family-headings);
   --typography-h-xx-large-weight: var(--font-weight-regular);
   --typography-h-x-large-weight: var(--font-weight-regular);
   --typography-h-large-small-font-size: var(--sb-font-size-medium--plus);

diff --git a/packages/dnb-eufemia/src/elements/typography/style/typography-mixins.scss b/packages/dnb-eufemia/src/elements/typography/style/typography-mixins.scss
@@ -97,7 +97,7 @@
     margin: 0;
   }
 
-  font-family: var(--typography-h-default-font-family);
+  font-family: var(--font-family-heading);
 
   // make icons inside heading responsive to the heading size
   .dnb-icon--default {

diff --git a/...dnb-eufemia/src/extensions/payment-card/__tests__/__snapshots__/PaymentCard.test.tsx.snap b/...dnb-eufemia/src/extensions/payment-card/__tests__/__snapshots__/PaymentCard.test.tsx.snap
@@ -21,7 +21,7 @@ exports[`PaymentCard scss has to match style dependencies css 1`] = `
  */
 :root {
   --sb-font-family-default: "Roboto", "Helvetica", "Arial", sans-serif;
-  --sb-font-family-headings: "MaisonNeueHeadings", "Roboto", "Helvetica",
+  --sb-font-family-heading: "MaisonNeueHeadings", "Roboto", "Helvetica",
     "Arial", sans-serif;
   --sb-font-weight-default: normal;
   --sb-font-weight-basis: normal;

diff --git a/packages/dnb-eufemia/src/style/elements/__tests__/__snapshots__/Elements.test.js.snap b/packages/dnb-eufemia/src/style/elements/__tests__/__snapshots__/Elements.test.js.snap
@@ -609,7 +609,6 @@ del .dnb-code {
  *
  */
 .dnb-lead, .dnb-h--xx-large, .dnb-h--x-large, .dnb-h--large, .dnb-h--medium, .dnb-h--basis, .dnb-h--small, .dnb-h--x-small, .dnb-core-style .dnb-lead, .dnb-core-style .dnb-h--xx-large, .dnb-core-style .dnb-h--x-large, .dnb-core-style .dnb-h--large, .dnb-core-style .dnb-h--medium, .dnb-core-style .dnb-h--basis, .dnb-core-style .dnb-h--small, .dnb-core-style .dnb-h--x-small, h1, h2, h3, h4, h5, h6, p, b, small, strong, .dnb-p, .dnb-t, .dnb-small, .dnb-table, sub, sup {
-  --typography-h-default-font-family: var(--font-family-default);
   --typography-h-default-font-weight: var(--font-weight-medium);
   --typography-h-xx-large-font-size: var(--font-size-xx-large);
   --typography-h-xx-large-line-height: var(--line-height-xx-large);
@@ -671,7 +670,7 @@ del .dnb-code {
 .dnb-core-style .dnb-h--small,
 .dnb-core-style .dnb-h--x-small {
   padding: 0;
-  font-family: var(--typography-h-default-font-family);
+  font-family: var(--font-family-heading);
 }
 .dnb-lead:not([class*=dnb-space]),
 .dnb-h--xx-large:not([class*=dnb-space]),

diff --git a/packages/dnb-eufemia/src/style/themes/theme-eiendom/properties.js b/packages/dnb-eufemia/src/style/themes/theme-eiendom/properties.js
@@ -2,7 +2,7 @@
 
 export default {
   '--sb-font-family-default': '"Roboto", "Helvetica", "Arial", sans-serif',
-  '--sb-font-family-headings': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
+  '--sb-font-family-heading': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
   '--sb-font-weight-default': 'normal',
   '--sb-font-weight-basis': 'normal',
   '--sb-font-weight-regular': 'normal',
@@ -94,6 +94,7 @@ export default {
   '--color-emerald-green-25': '#c4d4d6',
   '--color-emerald-green-10': '#e8eeef',
   '--font-family-default': '"DNB", sans-serif',
+  '--font-family-heading': 'var(--font-family-default)',
   '--font-family-monospace': '"DNBMono", "Menlo", "Consolas", "Roboto Mono",',
   '--font-weight-default': 'normal',
   '--font-weight-basis': 'normal',

diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/properties.js b/packages/dnb-eufemia/src/style/themes/theme-sbanken/properties.js
@@ -2,7 +2,7 @@
 
 export default {
   '--sb-font-family-default': '"Roboto", "Helvetica", "Arial", sans-serif',
-  '--sb-font-family-headings': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
+  '--sb-font-family-heading': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
   '--sb-font-weight-default': 'normal',
   '--sb-font-weight-basis': 'normal',
   '--sb-font-weight-regular': 'normal',
@@ -94,6 +94,7 @@ export default {
   '--color-emerald-green-25': '#c4d4d6',
   '--color-emerald-green-10': '#e8eeef',
   '--font-family-default': 'var(--sb-font-family-default)',
+  '--font-family-heading': 'var(--sb-font-family-heading)',
   '--font-family-monospace': '"DNBMono", "Menlo", "Consolas", "Roboto Mono",',
   '--font-weight-default': 'normal',
   '--font-weight-basis': 'normal',

diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/properties.scss b/packages/dnb-eufemia/src/style/themes/theme-sbanken/properties.scss
@@ -6,7 +6,7 @@
 :root {
   // Typography Family
   --sb-font-family-default: 'Roboto', 'Helvetica', 'Arial', sans-serif;
-  --sb-font-family-headings: 'MaisonNeueHeadings', 'Roboto', 'Helvetica',
+  --sb-font-family-heading: 'MaisonNeueHeadings', 'Roboto', 'Helvetica',
     'Arial', sans-serif;
 
   // Typography Weights

diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/theme-mapping.scss b/packages/dnb-eufemia/src/style/themes/theme-sbanken/theme-mapping.scss
@@ -12,6 +12,7 @@
 
   // font-family
   --font-family-default: var(--sb-font-family-default);
+  --font-family-heading: var(--sb-font-family-heading);
 
   // font-weight
   --font-weight-medium: var(--sb-font-weight-medium);

diff --git a/packages/dnb-eufemia/src/style/themes/theme-ui/properties.js b/packages/dnb-eufemia/src/style/themes/theme-ui/properties.js
@@ -2,7 +2,7 @@
 
 export default {
   '--sb-font-family-default': '"Roboto", "Helvetica", "Arial", sans-serif',
-  '--sb-font-family-headings': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
+  '--sb-font-family-heading': '"MaisonNeueHeadings", "Roboto", "Helvetica",',
   '--sb-font-weight-default': 'normal',
   '--sb-font-weight-basis': 'normal',
   '--sb-font-weight-regular': 'normal',
@@ -94,6 +94,7 @@ export default {
   '--color-emerald-green-25': '#c4d4d6',
   '--color-emerald-green-10': '#e8eeef',
   '--font-family-default': '"DNB", sans-serif',
+  '--font-family-heading': 'var(--font-family-default)',
   '--font-family-monospace': '"DNBMono", "Menlo", "Consolas", "Roboto Mono",',
   '--font-weight-default': 'normal',
   '--font-weight-basis': 'normal',

diff --git a/packages/dnb-eufemia/src/style/themes/theme-ui/properties.scss b/packages/dnb-eufemia/src/style/themes/theme-ui/properties.scss
@@ -6,6 +6,7 @@
 :root {
   // Typography Family
   --font-family-default: 'DNB', sans-serif;
+  --font-family-heading: var(--font-family-default);
   --font-family-monospace: 'DNBMono', 'Menlo', 'Consolas', 'Roboto Mono',
     'Ubuntu Monospace', 'Noto Mono', 'Oxygen Mono', 'Liberation Mono',
     monospace;