Skip to content

Update fonts #1471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added static/FiraSans-Medium.woff2
Binary file not shown.
Binary file added static/FiraSans-Regular.woff2
Binary file not shown.
Binary file added static/SourceCodePro-It.ttf.woff2
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.

This Font Software is licensed under the SIL Open Font License, Version 1.1.

Expand Down
Binary file added static/SourceCodePro-Regular.ttf.woff
Binary file not shown.
Binary file added static/SourceCodePro-Regular.ttf.woff2
Binary file not shown.
Binary file removed static/SourceCodePro-Regular.woff
Binary file not shown.
Binary file added static/SourceCodePro-Semibold.ttf.woff
Binary file not shown.
Binary file added static/SourceCodePro-Semibold.ttf.woff2
Binary file not shown.
Binary file removed static/SourceCodePro-Semibold.woff
Binary file not shown.
Binary file added static/SourceSerif4-Bold.ttf.woff
Binary file not shown.
Binary file added static/SourceSerif4-Bold.ttf.woff2
Binary file not shown.
Binary file added static/SourceSerif4-It.ttf.woff
Binary file not shown.
Binary file added static/SourceSerif4-It.ttf.woff2
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.

This Font Software is licensed under the SIL Open Font License, Version 1.1.

Expand Down
Binary file added static/SourceSerif4-Regular.ttf.woff
Binary file not shown.
Binary file added static/SourceSerif4-Regular.ttf.woff2
Binary file not shown.
Binary file removed static/SourceSerifPro-Bold.ttf.woff
Binary file not shown.
Binary file removed static/SourceSerifPro-It.ttf.woff
Binary file not shown.
Binary file removed static/SourceSerifPro-Regular.ttf.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion templates/style/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Fonts
$font-family-sans: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-serif: "Source Serif Pro", Georgia, Times, "Times New Roman", serif;
$font-family-serif: "Source Serif", Georgia, Times, "Times New Roman", serif;
$font-family-mono: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", Inconsolata, monospace;

// Sizes
Expand Down
47 changes: 34 additions & 13 deletions templates/style/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,76 @@
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
src:
local('Fira Sans'),
url("FiraSans-Regular.woff2") format('woff2'),
url("FiraSans-Regular.woff") format('woff');
}
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 500;
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
src:
local('Fira Sans Medium'),
url("FiraSans-Medium.woff2") format('woff2'),
url("FiraSans-Medium.woff") format('woff');
}

/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */
/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Serif';
font-style: normal;
font-weight: 400;
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
src:
local('Source Serif 4'),
url("SourceSerif4-Regular.ttf.woff2") format('woff2'),
url("SourceSerif4-Regular.ttf.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Serif';
font-style: italic;
font-weight: 400;
src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
src:
local('Source Serif 4'),
url("SourceSerif4-It.ttf.woff2") format('woff2'),
url("SourceSerif4-It.ttf.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Serif';
font-style: normal;
font-weight: 700;
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
src:
local('Source Serif 4'),
url("SourceSerif4-Bold.ttf.woff2") format('woff2'),
url("SourceSerif4-Bold.ttf.woff") format('woff');
}

/* See SourceCodePro-LICENSE.txt for the Source Code Pro license. */
/* See SourceCodePro-LICENSE.md for the Source Code Pro license. */
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 400;
/* Avoid using locally installed font because bad versions are in circulation:
* see https://github.com/rust-lang/rust/issues/24355 */
src: url("SourceCodePro-Regular.woff") format('woff');
src:
url("SourceCodePro-Regular.ttf.woff2") format('woff2'),
url("SourceCodePro-Regular.ttf.woff") format('woff');
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 600;
src: url("SourceCodePro-Semibold.woff") format('woff');
src:
url("SourceCodePro-Semibold.ttf.woff2") format('woff2'),
url("SourceCodePro-Semibold.ttf.woff") format('woff');
}
@font-face {
font-family: 'Source Code Pro';
font-style: italic;
font-weight: 400;
src: url("SourceCodePro-It.ttf.woff") format('woff');
src:
url("SourceCodePro-It.ttf.woff2") format('woff2'),
url("SourceCodePro-It.ttf.woff") format('woff');
}

html,
Expand Down