diff --git a/core/profiles/demo_umami/themes/umami/css/base.css b/core/profiles/demo_umami/themes/umami/css/base.css index 53443d5b59e..32f675429bc 100644 --- a/core/profiles/demo_umami/themes/umami/css/base.css +++ b/core/profiles/demo_umami/themes/umami/css/base.css @@ -3,6 +3,52 @@ * This is the base CSS file, for styling elements. */ +@font-face { + font-family: "Source Sans Pro"; + src: + local("Source Sans Pro"), + url("../fonts/source-sans-pro-v21-latin-regular.woff2") format("woff2"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: "Source Sans Pro"; + src: + local("Source Sans Pro"), + url("../fonts/source-sans-pro-v21-latin-italic.woff2") format("woff2"); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: "Source Sans Pro"; + src: + local("Source Sans Pro"), + url("../fonts/source-sans-pro-v21-latin-700.woff2") format("woff2"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: "Source Sans Pro"; + src: + local("Source Sans Pro"), + url("../fonts/source-sans-pro-v21-latin-700italic.woff2") format("woff2"); + font-weight: 700; + font-style: italic; +} + +@font-face { + font-family: "Scope One"; + src: + local("Scope One"), + local("ScopeOne-Regular"), + url("../fonts/scope-one-v14-latin-regular.woff2") format("woff2"); + font-weight: 400; + font-style: normal; +} + html { box-sizing: border-box; } @@ -34,7 +80,7 @@ body { margin: 0; color: #464646; background: #fbf5ee; - font-family: "Open Sans", Verdana, sans-serif; + font-family: "Source Sans Pro", Verdana, sans-serif; font-size: 1rem; line-height: 1.5rem; } diff --git a/core/profiles/demo_umami/themes/umami/fonts/scope-one-v14-latin-regular.woff2 b/core/profiles/demo_umami/themes/umami/fonts/scope-one-v14-latin-regular.woff2 new file mode 100644 index 00000000000..06e55ee7789 Binary files /dev/null and b/core/profiles/demo_umami/themes/umami/fonts/scope-one-v14-latin-regular.woff2 differ diff --git a/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-700.woff2 b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-700.woff2 new file mode 100644 index 00000000000..cd6bfd0f4b5 Binary files /dev/null and b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-700.woff2 differ diff --git a/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-700italic.woff2 b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-700italic.woff2 new file mode 100644 index 00000000000..b413356f73b Binary files /dev/null and b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-700italic.woff2 differ diff --git a/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-italic.woff2 b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-italic.woff2 new file mode 100644 index 00000000000..9448cd526e7 Binary files /dev/null and b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-italic.woff2 differ diff --git a/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-regular.woff2 b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-regular.woff2 new file mode 100644 index 00000000000..e49928e8297 Binary files /dev/null and b/core/profiles/demo_umami/themes/umami/fonts/source-sans-pro-v21-latin-regular.woff2 differ diff --git a/core/profiles/demo_umami/themes/umami/umami.info.yml b/core/profiles/demo_umami/themes/umami/umami.info.yml index cb5a178e300..35fe076ff52 100644 --- a/core/profiles/demo_umami/themes/umami/umami.info.yml +++ b/core/profiles/demo_umami/themes/umami/umami.info.yml @@ -8,8 +8,6 @@ libraries: - core/normalize - umami/global - umami/messages - - umami/webfonts-open-sans - - umami/webfonts-scope-one libraries-override: layout_builder/twocol_section: diff --git a/core/profiles/demo_umami/themes/umami/umami.libraries.yml b/core/profiles/demo_umami/themes/umami/umami.libraries.yml index 757d065ffae..151b0ea9586 100644 --- a/core/profiles/demo_umami/themes/umami/umami.libraries.yml +++ b/core/profiles/demo_umami/themes/umami/umami.libraries.yml @@ -84,26 +84,6 @@ user: component: css/components/user/user.css: { weight: -10 } -webfonts-open-sans: - remote: https://fonts.google.com - license: - name: Apache License, Version 2.0 - url: http://www.apache.org/licenses/LICENSE-2.0 - gpl-compatible: false - css: - theme: - 'https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700,700i': { type: external, minified: true } - -webfonts-scope-one: - remote: https://fonts.google.com - license: - name: SIL Open Font License, Version 1.1 - url: http://scripts.sil.org/OFL_web - gpl-compatible: false - css: - theme: - 'https://fonts.googleapis.com/css?family=Scope+One': { type: external, minified: true } - view-mode-card: css: theme: