@fremtind/jokul 5.0.0-next.5 → 5.0.0-next.7

package/styles/jkl/_typography.scss

@@ -70,11 +70,11 @@ $_valid-font-family-values: (
     "Jokul",
     "Jokul Display",
     "Jokul Mono",
-    "Jokul Material Symbols"
+    "Jokul Icons"
 );
 
 /// Hjelper sette riktig remse med fallback-fonts for Jokul, Jokul Display, og Jokul Mono.
-/// @param {"Jokul" | "Jokul Mono" | "Jokul Display" | "Jokul Material Symbols"} $font - Regular justerer seg automatisk til italic og bold basert på font-style og font-weight. Display og Mono er adskilte fontfamilier.
+/// @param {"Jokul" | "Jokul Mono" | "Jokul Display" | "Jokul Icons"} $font - Regular justerer seg automatisk til italic og bold basert på font-style og font-weight. Display og Mono er adskilte fontfamilier.
 /// @output - Ønsket fontfamilie med justert fallbackfont.
 @mixin use-font-family($font) {
     @if not list.index($_valid-font-family-values, $font) {
@@ -85,9 +85,9 @@ $_valid-font-family-values: (
         font-family: var(--jkl-font-family-mono);
     } @else if $font == "Jokul Display" {
         font-family: var(--jkl-font-family-display);
-    } @else if $font == "Jokul Material Symbols" {
+    } @else if $font == "Jokul Icons" {
         font-family:
-            "Jokul Material Symbols", "Jokul Material Symbols Fallback",
+            "Jokul Icons", "Jokul Icons Fallback",
             monospace;
     } @else {
         font-family: var(--jkl-font-family-regular);

package/styles/theme/_fonts.scss

@@ -11,17 +11,6 @@ $webfonts-dir: "/fonts" !default;
         src: url("#{$webfonts-dir}/InterVariable.woff2") format("woff2");
     }
 
-    @font-face {
-        font-family: "Adjusted Arial Fallback";
-        font-weight: 400;
-        font-style: normal;
-        src: local(arial);
-        size-adjust: 104%;
-        ascent-override: 82%;
-        descent-override: normal;
-        line-gap-override: 32%;
-    }
-
     @font-face {
         font-family: Jokul;
         font-display: fallback;
@@ -31,47 +20,44 @@ $webfonts-dir: "/fonts" !default;
     }
 
     @font-face {
-        font-family: "Adjusted Arial Fallback";
-        font-weight: 700;
+        font-family: "Jokul Display";
+        font-display: fallback;
+        font-weight: 400;
         font-style: normal;
-        src: local(arial);
-        size-adjust: 108%;
-        ascent-override: 83%;
-        descent-override: normal;
-        line-gap-override: 28%;
+        src: url("#{$webfonts-dir}/InterVariable.woff2") format("woff2");
     }
 
     @font-face {
-        font-family: Jokul;
+        font-family: "Jokul Mono";
         font-display: fallback;
         font-weight: 400;
-        font-style: italic;
+        font-style: normal;
         src: url("#{$webfonts-dir}/InterVariable.woff2") format("woff2");
     }
 
+    @font-face {
+        font-family: "Jokul Icons";
+        font-weight: 300 400;
+        font-style: normal;
+        src: url("#{$webfonts-dir}/Fremtind-Material-Symbols.woff2")
+            format("woff2");
+    }
+
     @font-face {
         font-family: "Adjusted Arial Fallback";
         font-weight: 400;
-        font-style: italic;
+        font-style: normal;
         src: local(arial);
-        size-adjust: 106%;
-        ascent-override: 83%;
+        size-adjust: 104%;
+        ascent-override: 82%;
         descent-override: normal;
-        line-gap-override: 28%;
-    }
-
-    @font-face {
-        font-family: Jokul;
-        font-display: fallback;
-        font-weight: 700;
-        font-style: italic;
-        src: url("#{$webfonts-dir}/InterVariable.woff2") format("woff2");
+        line-gap-override: 32%;
     }
 
     @font-face {
         font-family: "Adjusted Arial Fallback";
         font-weight: 700;
-        font-style: italic;
+        font-style: normal;
         src: local(arial);
         size-adjust: 108%;
         ascent-override: 83%;
@@ -79,14 +65,6 @@ $webfonts-dir: "/fonts" !default;
         line-gap-override: 28%;
     }
 
-    @font-face {
-        font-family: "Jokul Display";
-        font-display: fallback;
-        font-weight: 400;
-        font-style: normal;
-        src: url("#{$webfonts-dir}/InterVariable.woff2") format("woff2");
-    }
-
     @font-face {
         font-family: "Adjusted Arial Display Fallback";
         font-weight: 400;
@@ -98,14 +76,6 @@ $webfonts-dir: "/fonts" !default;
         line-gap-override: 40%;
     }
 
-    @font-face {
-        font-family: "Jokul Mono";
-        font-display: fallback;
-        font-weight: 400;
-        font-style: normal;
-        src: url("#{$webfonts-dir}/InterVariable.woff2") format("woff2");
-    }
-
     @font-face {
         font-family: "Adjusted Courier New Fallback";
         font-weight: 400;
@@ -118,15 +88,7 @@ $webfonts-dir: "/fonts" !default;
     }
 
     @font-face {
-        font-family: "Jokul Material Symbols";
-        font-weight: 300 400;
-        font-style: normal;
-        src: url("#{$webfonts-dir}/Fremtind-Material-Symbols.woff2")
-            format("woff2");
-    }
-
-    @font-face {
-        font-family: "Jokul Material Symbols Fallback";
+        font-family: "Jokul Icons Fallback";
         src: local(courier new);
         font-weight: 300 400;
         font-style: normal;

package/styles/theme/_index.scss

@@ -6,4 +6,4 @@
 @forward "brands/dnb";
 @forward "brands/eika";
 @forward "brands/sparebank1";
-@forward "brands/jokul";
+@forward "brands/fremtind";

package/styles/theme/brands/{jokul → fremtind}/_color-scheme.scss

@@ -4,7 +4,7 @@
 
 
 @layer jokul.theme {
-    [data-brand="jokul"] {
+    [data-brand="fremtind"] {
         /* stylelint-disable declaration-block-no-duplicate-custom-properties -- fallback and light-dark() declarations are intentionally paired. */
         --jkl-color-neutral-background-page: #F4F2EF;
         --jkl-color-neutral-background-page: light-dark(#F4F2EF, #1B1917);

package/styles/theme/brands/fremtind/_fonts.scss

@@ -0,0 +1,30 @@
+/**
+ * Do not edit directly, this file was auto-generated.
+ */
+
+
+$webfonts-dir-fremtind: "/fonts/brands/fremtind" !default;
+
+@layer jokul.theme {
+    @font-face {
+        font-family: "Inter";
+        font-display: fallback;
+        font-weight: 400;
+        font-style: normal;
+        src: url("#{$webfonts-dir-fremtind}/InterVariable.woff2") format("woff2");
+    }
+
+    @font-face {
+        font-family: "Inter";
+        font-display: fallback;
+        font-weight: 700;
+        font-style: normal;
+        src: url("#{$webfonts-dir-fremtind}/InterVariable.woff2") format("woff2");
+    }
+
+    [data-brand="fremtind"] {
+        --jkl-font-family-regular: Inter, 'Adjusted Arial Fallback', arial, sans-serif;
+        --jkl-font-family-display: Inter, 'Adjusted Arial Display Fallback', arial, sans-serif;
+        --jkl-font-family-mono: monospace, -apple-system, blinkmacsystemfont;
+    }
+}

package/styles/theme/brands/jokul/_fonts.scss

@@ -1,46 +0,0 @@
-/**
- * Do not edit directly, this file was auto-generated.
- */
-
-
-$webfonts-dir-jokul: "/fonts/brands/jokul" !default;
-
-@layer jokul.theme {
-    @font-face {
-        font-family: "Inter";
-        font-display: fallback;
-        font-weight: 300;
-        font-style: normal;
-        src: url("#{$webfonts-dir-jokul}/InterVariable.woff2") format("woff2");
-    }
-
-    @font-face {
-        font-family: "Inter";
-        font-display: fallback;
-        font-weight: 400;
-        font-style: normal;
-        src: url("#{$webfonts-dir-jokul}/InterVariable.woff2") format("woff2");
-    }
-
-    @font-face {
-        font-family: "Inter";
-        font-display: fallback;
-        font-weight: 600;
-        font-style: normal;
-        src: url("#{$webfonts-dir-jokul}/InterVariable.woff2") format("woff2");
-    }
-
-    @font-face {
-        font-family: "Inter";
-        font-display: fallback;
-        font-weight: 700;
-        font-style: normal;
-        src: url("#{$webfonts-dir-jokul}/InterVariable.woff2") format("woff2");
-    }
-
-    [data-brand="jokul"] {
-        --jkl-font-family-regular: Inter, 'Adjusted Arial Fallback', arial, sans-serif;
-        --jkl-font-family-display: Inter, 'Adjusted Arial Display Fallback', arial, sans-serif;
-        --jkl-font-family-mono: monospace, -apple-system, blinkmacsystemfont;
-    }
-}