Issue #2960583 by ressa, Anchal_gupta, andy-blum, parijke, Eli-T, shaal, markconroy, lauriii, kjay, ckrina, andrewmacpherson, mradcliffe: Include fonts in the Umami demo theme
(cherry picked from commit 1f1b26680ca79a7564c370a1b2cd8ed177a04e10)merge-requests/2808/head
parent
56683561dc
commit
ff1f52eb41
|
@ -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;
|
||||
}
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue