Merge pull request #1750 from SpareBank1/remove-museo-sans-as-fallback

Remove museo sans as fallback
SpareBank1 · Jan 16, 2024 · f8c3cce · f8c3cce
2 parents edf8f78 + 61f7b78
commit f8c3cce
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 203 deletions.
diff --git a/component-overview/webapp/styles/sb1ex-live.css b/component-overview/webapp/styles/sb1ex-live.css
@@ -19,7 +19,7 @@
     background-color: var(--ffe-farge-koksgraa);
     color: var(--ffe-farge-lysvarmgraa);
     white-space: pre-wrap;
-    font-family: 'SpareBank1-medium', 'MuseoSansRounded-700', arial, sans-serif;
+    font-family: 'SpareBank1-medium', arial, sans-serif;
     padding: var(--ffe-spacing-xs);
 }
 

diff --git a/component-overview/webapp/styles/sb1ex-toc.css b/component-overview/webapp/styles/sb1ex-toc.css
@@ -27,7 +27,7 @@
 }
 
 .sb1ex-toc__example-list {
-    font-family: 'SpareBank1-regular', 'MuseoSans-500', arial, sans-serif;
+    font-family: 'SpareBank1-regular', arial, sans-serif;
     line-height: 1.5rem;
     list-style-type: none;
     margin: 0;
@@ -49,7 +49,7 @@
 }
 
 .sb1ex-inpage-nav__list {
-    font-family: 'SpareBank1-regular', 'MuseoSans-500', arial, sans-serif;
+    font-family: 'SpareBank1-regular', arial, sans-serif;
     list-style-type: none;
     margin: 0;
     padding: 0;

diff --git a/packages/ffe-core/less/theme.less b/packages/ffe-core/less/theme.less
@@ -111,22 +111,19 @@
     /** Fonts */
 
     /* Default font */
-    --ffe-g-font: 'SpareBank1-regular', 'MuseoSans-500', arial, sans-serif;
+    --ffe-g-font: 'SpareBank1-regular', arial, sans-serif;
 
     /* h1 - h2 */
-    --ffe-g-font-heading: 'SpareBank1-title-medium', 'MuseoSansRounded-700',
-        arial, sans-serif;
+    --ffe-g-font-heading: 'SpareBank1-title-medium', arial, sans-serif;
 
     /* h3 - h6 */
-    --ffe-g-font-heading-small: 'SpareBank1-medium', 'MuseoSansRounded-700',
-        arial, sans-serif;
+    --ffe-g-font-heading-small: 'SpareBank1-medium', arial, sans-serif;
 
     /* Bold text */
-    --ffe-g-font-strong: 'SpareBank1-medium', 'MuseoSansRounded-700', arial,
-        sans-serif;
+    --ffe-g-font-strong: 'SpareBank1-medium', arial, sans-serif;
 
     /* Emphasized text */
-    --ffe-g-font-italic: 'SpareBank1-italic', 'MuseoSans-500', arial, sans-serif;
+    --ffe-g-font-italic: 'SpareBank1-italic', arial, sans-serif;
 
     /** Typography */
 

diff --git a/packages/ffe-header/less/theme.less b/packages/ffe-header/less/theme.less
@@ -9,8 +9,7 @@
     --ffe-v-link-disabled-color: @ffe-farge-moerkgraa;
     --ffe-v-notification-bubble-background-color: @ffe-farge-skog;
     --ffe-v-notification-bubble-text-color: @ffe-farge-hvit;
-    --ffe-v-font-strong: 'SpareBank1-medium', 'MuseoSansRounded-700', arial,
-        sans-serif;
+    --ffe-v-font-strong: 'SpareBank1-medium', arial, sans-serif;
 
     /* User nav menu */
     --ffe-v-usernav-link-hover-background-color: @ffe-farge-frost-30;

diff --git a/packages/ffe-tables/less/table.less b/packages/ffe-tables/less/table.less
@@ -1,5 +1,5 @@
 .ffe-table {
-    font-family: 'SpareBank1-regular', 'MuseoSans-500', arial, sans-serif;
+    font-family: 'SpareBank1-regular', arial, sans-serif;
     margin: @ffe-spacing-sm 0;
     min-width: 100%;
     text-align: left;

diff --git a/packages/ffe-webfonts/LICENSE-fonts.md b/packages/ffe-webfonts/LICENSE-fonts.md
diff --git a/packages/ffe-webfonts/fonts-inline.less b/packages/ffe-webfonts/fonts-inline.less
diff --git a/packages/ffe-webfonts/fonts.less b/packages/ffe-webfonts/fonts.less
diff --git a/packages/ffe-webfonts/fonts/2FDE32_0_0.woff b/packages/ffe-webfonts/fonts/2FDE32_0_0.woff
diff --git a/packages/ffe-webfonts/fonts/2FDE32_0_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_0_0.woff2
diff --git a/packages/ffe-webfonts/fonts/2FDE32_1_0.woff b/packages/ffe-webfonts/fonts/2FDE32_1_0.woff
diff --git a/packages/ffe-webfonts/fonts/2FDE32_1_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_1_0.woff2
diff --git a/packages/ffe-webfonts/fonts/2FDE32_2_0.woff b/packages/ffe-webfonts/fonts/2FDE32_2_0.woff
diff --git a/packages/ffe-webfonts/fonts/2FDE32_2_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_2_0.woff2
diff --git a/packages/ffe-webfonts/fonts/2FDE32_3_0.woff b/packages/ffe-webfonts/fonts/2FDE32_3_0.woff
diff --git a/packages/ffe-webfonts/fonts/2FDE32_3_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_3_0.woff2
diff --git a/packages/ffe-webfonts/fonts/2FDE32_4_0.woff b/packages/ffe-webfonts/fonts/2FDE32_4_0.woff
diff --git a/packages/ffe-webfonts/fonts/2FDE32_4_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_4_0.woff2
diff --git a/packages/ffe-webfonts/package.json b/packages/ffe-webfonts/package.json
@@ -19,7 +19,7 @@
         "url": "ssh://[email protected]:SpareBank1/designsystem.git"
     },
     "scripts": {
-        "build": "lessc fonts-inline.less fonts.css && lessc sb1-fonts-inline.less sb1-fonts.css",
+        "build": "lessc sb1-fonts-inline.less sb1-fonts.css",
         "lint": "ffe-buildtool stylelint *.less",
         "test": "npm run lint"
     },