Skip to content

Commit

Permalink
Switch main font
Browse files Browse the repository at this point in the history
  • Loading branch information
Porges committed Jun 29, 2024
1 parent 6033895 commit c5f0192
Show file tree
Hide file tree
Showing 45 changed files with 259 additions and 232 deletions.
160 changes: 20 additions & 140 deletions fonts/charis.css
Original file line number Diff line number Diff line change
@@ -1,163 +1,39 @@

/* Latin (BasicLatin, GeneralPunctuation, Latin1Supplement) */
/* LatinFallback (BasicLatin, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Latin-Bold.woff2') format('woff2');
font-display: block;
font-weight: bold;
unicode-range: U+0000-007f,U+2000-206f,U+0080-00ff,U+2150-215e;
}
/* Latin (BasicLatin, GeneralPunctuation, Latin1Supplement) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Latin-BoldItalic.woff2') format('woff2');
font-display: block;
font-style: italic;
font-weight: bold;
unicode-range: U+0000-007f,U+2000-206f,U+0080-00ff,U+2150-215e;
}
/* Latin (BasicLatin, GeneralPunctuation, Latin1Supplement) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Latin-Italic.woff2') format('woff2');
font-display: block;
font-style: italic;
unicode-range: U+0000-007f,U+2000-206f,U+0080-00ff,U+2150-215e;
}
/* Latin (BasicLatin, GeneralPunctuation, Latin1Supplement) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Latin-Regular.woff2') format('woff2');
font-display: block;
unicode-range: U+0000-007f,U+2000-206f,U+0080-00ff,U+2150-215e;
}
/* LatinExt (LatinExtendedA, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinExt-Bold.woff2') format('woff2');
font-display: swap;
font-weight: bold;
unicode-range: U+0100-017f,U+0300-036f;
}
/* LatinExt (LatinExtendedA, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinExt-BoldItalic.woff2') format('woff2');
font-display: swap;
font-style: italic;
font-weight: bold;
unicode-range: U+0100-017f,U+0300-036f;
}
/* LatinExt (LatinExtendedA, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinExt-Italic.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0100-017f,U+0300-036f;
}
/* LatinExt (LatinExtendedA, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinExt-Regular.woff2') format('woff2');
font-display: swap;
unicode-range: U+0100-017f,U+0300-036f;
}
/* Cyrillic (Cyrillic) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Cyrillic-Bold.woff2') format('woff2');
font-display: swap;
font-weight: bold;
unicode-range: U+0400-04ff;
}
/* Cyrillic (Cyrillic) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Cyrillic-BoldItalic.woff2') format('woff2');
font-display: swap;
font-style: italic;
font-weight: bold;
unicode-range: U+0400-04ff;
}
/* Cyrillic (Cyrillic) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Cyrillic-Italic.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0400-04ff;
}
/* Cyrillic (Cyrillic) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Cyrillic-Regular.woff2') format('woff2');
font-display: swap;
unicode-range: U+0400-04ff;
}
/* ChineseTranslit (LatinExtendedB, SuperscriptsandSubscripts) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-ChineseTranslit-Bold.woff2') format('woff2');
font-display: swap;
font-weight: bold;
unicode-range: U+0180-024f,U+2070-209f;
}
/* ChineseTranslit (LatinExtendedB, SuperscriptsandSubscripts) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-ChineseTranslit-BoldItalic.woff2') format('woff2');
font-display: swap;
font-style: italic;
font-weight: bold;
unicode-range: U+0180-024f,U+2070-209f;
}
/* ChineseTranslit (LatinExtendedB, SuperscriptsandSubscripts) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-ChineseTranslit-Italic.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0180-024f,U+2070-209f;
}
/* ChineseTranslit (LatinExtendedB, SuperscriptsandSubscripts) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-ChineseTranslit-Regular.woff2') format('woff2');
font-display: swap;
unicode-range: U+0180-024f,U+2070-209f;
}
/* VietIndic (LatinExtendedAdditional) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-VietIndic-Bold.woff2') format('woff2');
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinFallback-Bold.woff2') format('woff2');
font-display: swap;
font-weight: bold;
unicode-range: U+1e00-1eff;
unicode-range: U+0000-007f,U+0300-036f;
font-optical-sizing: auto;
}
/* VietIndic (LatinExtendedAdditional) */
/* LatinFallback (BasicLatin, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-VietIndic-BoldItalic.woff2') format('woff2');
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinFallback-BoldItalic.woff2') format('woff2');
font-display: swap;
font-style: italic;
font-weight: bold;
unicode-range: U+1e00-1eff;
unicode-range: U+0000-007f,U+0300-036f;
font-optical-sizing: auto;
}
/* VietIndic (LatinExtendedAdditional) */
/* LatinFallback (BasicLatin, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-VietIndic-Italic.woff2') format('woff2');
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinFallback-Italic.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+1e00-1eff;
unicode-range: U+0000-007f,U+0300-036f;
font-optical-sizing: auto;
}
/* VietIndic (LatinExtendedAdditional) */
/* LatinFallback (BasicLatin, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-VietIndic-Regular.woff2') format('woff2');
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-LatinFallback-Regular.woff2') format('woff2');
font-display: swap;
unicode-range: U+1e00-1eff;
unicode-range: U+0000-007f,U+0300-036f;
font-optical-sizing: auto;
}
/* Historical (LatinExtendedD) */
@font-face {
Expand All @@ -166,6 +42,7 @@
font-display: swap;
font-weight: bold;
unicode-range: U+a720-a7ff;
font-optical-sizing: auto;
}
/* Historical (LatinExtendedD) */
@font-face {
Expand All @@ -175,6 +52,7 @@
font-style: italic;
font-weight: bold;
unicode-range: U+a720-a7ff;
font-optical-sizing: auto;
}
/* Historical (LatinExtendedD) */
@font-face {
Expand All @@ -183,11 +61,13 @@
font-display: swap;
font-style: italic;
unicode-range: U+a720-a7ff;
font-optical-sizing: auto;
}
/* Historical (LatinExtendedD) */
@font-face {
font-family: 'Charis SIL';
src: local('Charis SIL'), url('/fonts/charis/CharisSIL-Historical-Regular.woff2') format('woff2');
font-display: swap;
unicode-range: U+a720-a7ff;
font-optical-sizing: auto;
}
Binary file removed fonts/charis/CharisSIL-ChineseTranslit-Bold.woff2
Binary file not shown.
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-ChineseTranslit-Italic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-ChineseTranslit-Regular.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Cyrillic-Bold.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Cyrillic-BoldItalic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Cyrillic-Italic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Cyrillic-Regular.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Latin-Bold.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Latin-BoldItalic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Latin-Italic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-Latin-Regular.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-LatinExt-Bold.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-LatinExt-BoldItalic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-LatinExt-Italic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-LatinExt-Regular.woff2
Binary file not shown.
Binary file added fonts/charis/CharisSIL-LatinFallback-Bold.woff2
Binary file not shown.
Binary file not shown.
Binary file added fonts/charis/CharisSIL-LatinFallback-Italic.woff2
Binary file not shown.
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-VietIndic-Bold.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-VietIndic-BoldItalic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-VietIndic-Italic.woff2
Binary file not shown.
Binary file removed fonts/charis/CharisSIL-VietIndic-Regular.woff2
Binary file not shown.
103 changes: 103 additions & 0 deletions fonts/sourceserif4.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@

/* Latin (BasicLatin, GeneralPunctuation, Latin1Supplement, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-Latin-Italic.ttf.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0000-007f,U+2000-206f,U+0080-00ff,U+0300-036f;
font-optical-sizing: auto;
}
/* Latin (BasicLatin, GeneralPunctuation, Latin1Supplement, CombiningDiacriticalMarks) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-Latin-Roman.ttf.woff2') format('woff2');
font-display: swap;
unicode-range: U+0000-007f,U+2000-206f,U+0080-00ff,U+0300-036f;
font-optical-sizing: auto;
}
/* LatinExt (LatinExtendedA, SpacingModifierLetters, IpaExtensions) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-LatinExt-Italic.ttf.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0100-017f,U+02b0-02ff,U+0250-02af;
font-optical-sizing: auto;
}
/* LatinExt (LatinExtendedA, SpacingModifierLetters, IpaExtensions) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-LatinExt-Roman.ttf.woff2') format('woff2');
font-display: swap;
unicode-range: U+0100-017f,U+02b0-02ff,U+0250-02af;
font-optical-sizing: auto;
}
/* ChineseTranslit (LatinExtendedB, SuperscriptsandSubscripts) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-ChineseTranslit-Italic.ttf.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0180-024f,U+2070-209f;
font-optical-sizing: auto;
}
/* ChineseTranslit (LatinExtendedB, SuperscriptsandSubscripts) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-ChineseTranslit-Roman.ttf.woff2') format('woff2');
font-display: swap;
unicode-range: U+0180-024f,U+2070-209f;
font-optical-sizing: auto;
}
/* VietIndic (LatinExtendedAdditional) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-VietIndic-Italic.ttf.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+1e00-1eff;
font-optical-sizing: auto;
}
/* VietIndic (LatinExtendedAdditional) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-VietIndic-Roman.ttf.woff2') format('woff2');
font-display: swap;
unicode-range: U+1e00-1eff;
font-optical-sizing: auto;
}
/* Cyrillic (Cyrillic) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-Cyrillic-Italic.ttf.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0400-04ff;
font-optical-sizing: auto;
}
/* Cyrillic (Cyrillic) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-Cyrillic-Roman.ttf.woff2') format('woff2');
font-display: swap;
unicode-range: U+0400-04ff;
font-optical-sizing: auto;
}
/* Greek (GreekandCoptic) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-Greek-Italic.ttf.woff2') format('woff2');
font-display: swap;
font-style: italic;
unicode-range: U+0370-03ff;
font-optical-sizing: auto;
}
/* Greek (GreekandCoptic) */
@font-face {
font-family: 'Source Serif 4';
src: local('Source Serif 4'), url('/fonts/sourceserif4/SourceSerif4Variable-Greek-Roman.ttf.woff2') format('woff2');
font-display: swap;
unicode-range: U+0370-03ff;
font-optical-sizing: auto;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions src/_includes/layout.11ty.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ exports.render = async function (data) {
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" type="image/png" href="/favicon.png" />
<link rel="preload" href="/fonts/charis/CharisSIL-Latin-Regular.woff2" as="font" type="font/woff2" />
<link rel="preload" href="/fonts/charis/CharisSIL-Latin-Italic.woff2" as="font" type="font/woff2" />
<link rel="preload" href="/fonts/charis/CharisSIL-Latin-Bold.woff2" as="font" type="font/woff2" />
<link rel="preload" href="/fonts/sourceserif4/SourceSerif4Variable-Latin-Roman.ttf.woff2" as="font" type="font/woff2" crossorigin/>
<link rel="preload" href="/fonts/sourceserif4/SourceSerif4Variable-Latin-Italic.ttf.woff2" as="font" type="font/woff2" crossorigin/>
<link rel="stylesheet" href="/fonts/sourceserif4.css" type="text/css" />
<link rel="stylesheet" href="/fonts/charis.css" type="text/css" />
<link rel="stylesheet" href="/css/index.css" type="text/css" />
<link rel="stylesheet" href="/css/print.css" type="text/css" media="print" />
Expand Down
2 changes: 1 addition & 1 deletion src/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ BY](http://creativecommons.org/licenses/by/3.0/).

The site is generated with [Eleventy](https://www.11ty.dev/), with a bunch of custom code!

Thi main font used is [Charis SIL](https://software.sil.org/charis/), which is licensed under the [SIL Open Font License 1.1](https://scripts.sil.org/OFL).
The main font used is Adobe’s [Source Serif 4](https://fonts.adobe.com/fonts/source-serif-4), which is licensed under the [SIL Open Font License 1.1](https://scripts.sil.org/OFL). [Charis SIL](https://software.sil.org/charis/) (also licensed under the [SIL Open Font License 1.1](https://scripts.sil.org/OFL)) is used as a fallback for some rarer characters (e.g. mediævalist abbreviations), as it is very similar in design to Source Serif.

<!--
The main font used is the [Brill typeface v4.0](https://brill.com/page/BrillFont/brill-typeface), which is free for non-commercial use.
Expand Down
4 changes: 2 additions & 2 deletions src/sass/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
url('/fonts/EgyptianText.woff') format('woff');
}


$font-family-sans-serif:
"Charis SIL",
"Source Serif 4",
"Charis SIL", // very similar to Source Serif, used as a fallback for medievalist and other chars
"NKS30",
"Noto Emoji",
serif,
Expand Down
Loading

0 comments on commit c5f0192

Please sign in to comment.