diff --git a/component-overview/webapp/styles/sb1ex-live.css b/component-overview/webapp/styles/sb1ex-live.css index 903b962ca1..7570256a3b 100644 --- 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 index bfde7a0d6b..b929332a17 100644 --- 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 index 2bc0178b6d..99b77aed03 100644 --- 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 index 66ee2166c9..127b6b9d33 100644 --- 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 index 1fe6e76277..320a4a3505 100644 --- 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 deleted file mode 100644 index d6e50aca91..0000000000 --- a/packages/ffe-webfonts/LICENSE-fonts.md +++ /dev/null @@ -1,36 +0,0 @@ -MyFonts Webfont Build ID 3529082, 2018-02-19T03:00:12-0500 - -The fonts listed in this notice are subject to the End User License -Agreement(s) entered into by the website owner. All other parties are -explicitly restricted from using the Licensed Webfonts(s). - -You may obtain a valid license at the URLs below. - -Webfont: MuseoSans-300 by exljbris -URL: https://www.myfonts.com/fonts/exljbris/museo-sans/300/ -Copyright: Copyright (c) 2008 by Jos Buivenga. All rights reserved. -Licensed pageviews: 1,000,000,000 - -Webfont: MuseoSans-500 by exljbris -URL: https://www.myfonts.com/fonts/exljbris/museo-sans/500/ -Copyright: Copyright (c) 2008 by Jos Buivenga. All rights reserved. -Licensed pageviews: 999,999,999 - -Webfont: MuseoSansRounded-300 by exljbris -URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/300/ -Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. -Licensed pageviews: 1,000,000,000 - -Webfont: MuseoSansRounded-500 by exljbris -URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/500/ -Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. -Licensed pageviews: 1,000,000,000 - -Webfont: MuseoSansRounded-700 by exljbris -URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/700/ -Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. -Licensed pageviews: 1,000,000,000 - - -License: https://www.myfonts.com/viewlicense?type=web&buildid=3529082 -© 2018 MyFonts Inc diff --git a/packages/ffe-webfonts/fonts-inline.less b/packages/ffe-webfonts/fonts-inline.less deleted file mode 100644 index f45335b0a3..0000000000 --- a/packages/ffe-webfonts/fonts-inline.less +++ /dev/null @@ -1,76 +0,0 @@ -/*! - * @license - * MyFonts Webfont Build ID 3529082, 2018-02-19T03:00:12-0500 - * - * The fonts listed in this notice are subject to the End User License - * Agreement(s) entered into by the website owner. All other parties are - * explicitly restricted from using the Licensed Webfonts(s). - * - * You may obtain a valid license at the URLs below. - * - * Webfont: MuseoSans-300 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans/300/ - * Copyright: Copyright (c) 2008 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * Webfont: MuseoSans-500 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans/500/ - * Copyright: Copyright (c) 2008 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 999,999,999 - * - * Webfont: MuseoSansRounded-300 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/300/ - * Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * Webfont: MuseoSansRounded-500 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/500/ - * Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * Webfont: MuseoSansRounded-700 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/700/ - * Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * - * License: https://www.myfonts.com/viewlicense?type=web&buildid=3529082 - * - * © 2018 MyFonts Inc - */ -@fonts-url: './fonts'; - -@font-face { - font-family: 'MuseoSans-300'; - font-display: fallback; - src: data-uri('./fonts/2FDE32_0_0.woff2') format('woff2'), - data-uri('./fonts/2FDE32_0_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSans-500'; - font-display: fallback; - src: data-uri('./fonts/2FDE32_1_0.woff2') format('woff2'), - data-uri('./fonts/2FDE32_1_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSansRounded-300'; - font-display: fallback; - src: data-uri('./fonts/2FDE32_2_0.woff2') format('woff2'), - data-uri('./fonts/2FDE32_2_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSansRounded-500'; - font-display: fallback; - src: data-uri('./fonts/2FDE32_3_0.woff2') format('woff2'), - data-uri('./fonts/2FDE32_3_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSansRounded-700'; - font-display: fallback; - src: data-uri('./fonts/2FDE32_4_0.woff2') format('woff2'), - data-uri('./fonts/2FDE32_4_0.woff') format('woff'); -} diff --git a/packages/ffe-webfonts/fonts.less b/packages/ffe-webfonts/fonts.less deleted file mode 100644 index f65a3b7aad..0000000000 --- a/packages/ffe-webfonts/fonts.less +++ /dev/null @@ -1,76 +0,0 @@ -/*! - * @license - * MyFonts Webfont Build ID 3529082, 2018-02-19T03:00:12-0500 - * - * The fonts listed in this notice are subject to the End User License - * Agreement(s) entered into by the website owner. All other parties are - * explicitly restricted from using the Licensed Webfonts(s). - * - * You may obtain a valid license at the URLs below. - * - * Webfont: MuseoSans-300 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans/300/ - * Copyright: Copyright (c) 2008 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * Webfont: MuseoSans-500 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans/500/ - * Copyright: Copyright (c) 2008 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 999,999,999 - * - * Webfont: MuseoSansRounded-300 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/300/ - * Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * Webfont: MuseoSansRounded-500 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/500/ - * Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * Webfont: MuseoSansRounded-700 by exljbris - * URL: https://www.myfonts.com/fonts/exljbris/museo-sans-rounded/700/ - * Copyright: Copyright (c) 2011 by Jos Buivenga. All rights reserved. - * Licensed pageviews: 1,000,000,000 - * - * - * License: https://www.myfonts.com/viewlicense?type=web&buildid=3529082 - * - * © 2018 MyFonts Inc - */ -@fonts-url: './fonts'; - -@font-face { - font-family: 'MuseoSans-300'; - font-display: fallback; - src: url('@{fonts-url}/2FDE32_0_0.woff2') format('woff2'), - url('@{fonts-url}/2FDE32_0_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSans-500'; - font-display: fallback; - src: url('@{fonts-url}/2FDE32_1_0.woff2') format('woff2'), - url('@{fonts-url}/2FDE32_1_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSansRounded-300'; - font-display: fallback; - src: url('@{fonts-url}/2FDE32_2_0.woff2') format('woff2'), - url('@{fonts-url}/2FDE32_2_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSansRounded-500'; - font-display: fallback; - src: url('@{fonts-url}/2FDE32_3_0.woff2') format('woff2'), - url('@{fonts-url}/2FDE32_3_0.woff') format('woff'); -} - -@font-face { - font-family: 'MuseoSansRounded-700'; - font-display: fallback; - src: url('@{fonts-url}/2FDE32_4_0.woff2') format('woff2'), - url('@{fonts-url}/2FDE32_4_0.woff') format('woff'); -} diff --git a/packages/ffe-webfonts/fonts/2FDE32_0_0.woff b/packages/ffe-webfonts/fonts/2FDE32_0_0.woff deleted file mode 100644 index 4302341769..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_0_0.woff and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_0_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_0_0.woff2 deleted file mode 100644 index b67c1fb089..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_0_0.woff2 and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_1_0.woff b/packages/ffe-webfonts/fonts/2FDE32_1_0.woff deleted file mode 100644 index b4e016975d..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_1_0.woff and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_1_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_1_0.woff2 deleted file mode 100644 index d35f3f5a0d..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_1_0.woff2 and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_2_0.woff b/packages/ffe-webfonts/fonts/2FDE32_2_0.woff deleted file mode 100644 index 79a123ecfa..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_2_0.woff and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_2_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_2_0.woff2 deleted file mode 100644 index 1674d3b578..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_2_0.woff2 and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_3_0.woff b/packages/ffe-webfonts/fonts/2FDE32_3_0.woff deleted file mode 100644 index 1bf4c84a75..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_3_0.woff and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_3_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_3_0.woff2 deleted file mode 100644 index 9a878dc6f2..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_3_0.woff2 and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_4_0.woff b/packages/ffe-webfonts/fonts/2FDE32_4_0.woff deleted file mode 100644 index 349390acad..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_4_0.woff and /dev/null differ diff --git a/packages/ffe-webfonts/fonts/2FDE32_4_0.woff2 b/packages/ffe-webfonts/fonts/2FDE32_4_0.woff2 deleted file mode 100644 index 00f4e04566..0000000000 Binary files a/packages/ffe-webfonts/fonts/2FDE32_4_0.woff2 and /dev/null differ diff --git a/packages/ffe-webfonts/package.json b/packages/ffe-webfonts/package.json index d1703d593f..340377b19a 100644 --- a/packages/ffe-webfonts/package.json +++ b/packages/ffe-webfonts/package.json @@ -19,7 +19,7 @@ "url": "ssh://git@github.com: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" },