From 776ae2ccee825551dd297a1325edecd639f0b2d2 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 30 Oct 2020 07:56:57 +0100 Subject: [PATCH] fonts --- .gitignore | 1 + style/fonts/andika/Andika-R.woff | 3 --- style/fonts/andika/andika.css | 4 --- style/fonts/charis/CharisSIL-B.ttf | 3 +++ style/fonts/charis/CharisSIL-B.woff | 3 +++ style/fonts/charis/CharisSIL-BI.ttf | 3 +++ style/fonts/charis/CharisSIL-BI.woff | 3 +++ style/fonts/charis/CharisSIL-I.ttf | 3 +++ style/fonts/charis/CharisSIL-I.woff | 3 +++ style/fonts/charis/CharisSIL-R.ttf | 3 +++ style/fonts/charis/CharisSIL-R.woff | 3 +++ style/fonts/charis/charis.css | 33 +++++++++++++++++++++++++ style/fonts/pragmatapro/pragmatapro.css | 25 +++++++++++++++++++ style/page.css | 12 ++++++--- 14 files changed, 92 insertions(+), 10 deletions(-) delete mode 100755 style/fonts/andika/Andika-R.woff delete mode 100644 style/fonts/andika/andika.css create mode 100644 style/fonts/charis/CharisSIL-B.ttf create mode 100644 style/fonts/charis/CharisSIL-B.woff create mode 100644 style/fonts/charis/CharisSIL-BI.ttf create mode 100644 style/fonts/charis/CharisSIL-BI.woff create mode 100644 style/fonts/charis/CharisSIL-I.ttf create mode 100644 style/fonts/charis/CharisSIL-I.woff create mode 100644 style/fonts/charis/CharisSIL-R.ttf create mode 100644 style/fonts/charis/CharisSIL-R.woff create mode 100644 style/fonts/charis/charis.css create mode 100644 style/fonts/pragmatapro/pragmatapro.css diff --git a/.gitignore b/.gitignore index 6a78d65..62275eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ _build _tmp dist-newstyle +style/fonts/pragmatapro/*.woff2 diff --git a/style/fonts/andika/Andika-R.woff b/style/fonts/andika/Andika-R.woff deleted file mode 100755 index 4f907a6..0000000 --- a/style/fonts/andika/Andika-R.woff +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:924a7581590e0866ff8b1c61f9dd197cd180f4bc25dbdd11dbb01217179ac066 -size 535704 diff --git a/style/fonts/andika/andika.css b/style/fonts/andika/andika.css deleted file mode 100644 index 1015b67..0000000 --- a/style/fonts/andika/andika.css +++ /dev/null @@ -1,4 +0,0 @@ -@font-face { - font-family: Andika; - src: url(Andika-R.woff); -} diff --git a/style/fonts/charis/CharisSIL-B.ttf b/style/fonts/charis/CharisSIL-B.ttf new file mode 100644 index 0000000..84a5ee8 --- /dev/null +++ b/style/fonts/charis/CharisSIL-B.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61e8b37bfb80ebadd4255ae45eaae93dbab878315a709a2c778f5a945f74fffe +size 1443920 diff --git a/style/fonts/charis/CharisSIL-B.woff b/style/fonts/charis/CharisSIL-B.woff new file mode 100644 index 0000000..605c3cd --- /dev/null +++ b/style/fonts/charis/CharisSIL-B.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46bf9ec1380f2265fefb442e7311420080b775fef1a3351fe9a4ff8b464fc8b4 +size 541322 diff --git a/style/fonts/charis/CharisSIL-BI.ttf b/style/fonts/charis/CharisSIL-BI.ttf new file mode 100644 index 0000000..7fadfe7 --- /dev/null +++ b/style/fonts/charis/CharisSIL-BI.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95103617b47f5d32655fab7e31b4e76f2747c7cc1a8004137dcc3d6eade38074 +size 1504932 diff --git a/style/fonts/charis/CharisSIL-BI.woff b/style/fonts/charis/CharisSIL-BI.woff new file mode 100644 index 0000000..cb425f2 --- /dev/null +++ b/style/fonts/charis/CharisSIL-BI.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac0bf31dfa6b49d979021df80493def2c3fc6a1ef4d36aa6b61489b0d3381c71 +size 583594 diff --git a/style/fonts/charis/CharisSIL-I.ttf b/style/fonts/charis/CharisSIL-I.ttf new file mode 100644 index 0000000..d9d888c --- /dev/null +++ b/style/fonts/charis/CharisSIL-I.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c406ee3993f79bc89329a45afba0dc761fd61ff7cb35ca7d6a8d9646625100dd +size 1510100 diff --git a/style/fonts/charis/CharisSIL-I.woff b/style/fonts/charis/CharisSIL-I.woff new file mode 100644 index 0000000..73aa404 --- /dev/null +++ b/style/fonts/charis/CharisSIL-I.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c59641eeb3dae22630b60e94f8c61cda4234aa0cf223a7afdf36f62508e8f2f +size 576146 diff --git a/style/fonts/charis/CharisSIL-R.ttf b/style/fonts/charis/CharisSIL-R.ttf new file mode 100644 index 0000000..b28b232 --- /dev/null +++ b/style/fonts/charis/CharisSIL-R.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e47ec6c29ae786e003cec104632fc954f201338ca282e3a4adf8b3d262d04fa6 +size 1508296 diff --git a/style/fonts/charis/CharisSIL-R.woff b/style/fonts/charis/CharisSIL-R.woff new file mode 100644 index 0000000..4735909 --- /dev/null +++ b/style/fonts/charis/CharisSIL-R.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd9280db2beceaa516e4644d98afa1060f474bf18aaabc20ba653a8f350742bb +size 557106 diff --git a/style/fonts/charis/charis.css b/style/fonts/charis/charis.css new file mode 100644 index 0000000..211db1e --- /dev/null +++ b/style/fonts/charis/charis.css @@ -0,0 +1,33 @@ +@font-face { + font-family: Charis; + font-weight: 400; + src: + url(CharisSIL-R.ttf) format('truetype'), + url(CharisSIL-R.woff) format('woff'); +} + +@font-face { + font-family: Charis; + font-weight: 500; + src: + url(CharisSIL-B.ttf) format('truetype'), + url(CharisSIL-B.woff) format('woff'); +} + +@font-face { + font-family: Charis; + font-weight: 400; + font-style: italic; + src: + url(CharisSIL-I.ttf) format('truetype'), + url(CharisSIL-I.woff) format('woff'); +} + +@font-face { + font-family: Charis; + font-weight: 500; + font-style: italic; + src: + url(CharisSIL-BI.ttf) format('truetype'), + url(CharisSIL-BI.woff) format('woff'); +} diff --git a/style/fonts/pragmatapro/pragmatapro.css b/style/fonts/pragmatapro/pragmatapro.css new file mode 100644 index 0000000..398603f --- /dev/null +++ b/style/fonts/pragmatapro/pragmatapro.css @@ -0,0 +1,25 @@ +@font-face { + font-family: PragmataPro; + font-weight: 400; + src: url(r.woff2); +} + +@font-face { + font-family: PragmataPro; + font-weight: 500; + src: url(b.woff2); +} + +@font-face { + font-family: PragmataPro; + font-weight: 400; + font-style: italic; + src: url(i.woff2); +} + +@font-face { + font-family: PragmataPro; + font-weight: 500; + font-style: italic; + src: url(bi.woff2); +} diff --git a/style/page.css b/style/page.css index 5e39f80..abb250e 100644 --- a/style/page.css +++ b/style/page.css @@ -1,5 +1,6 @@ @import url(fonts/muller/muller.css); -@import url(fonts/andika/andika.css); +@import url(fonts/charis/charis.css); +@import url(fonts/pragmatapro/pragmatapro.css); @import url(counters.css); @@ -8,6 +9,8 @@ --fg-col: hsl(336deg, 17%, 11%); --bg-col: hsl(40deg, 91%, 98%); --link-col: hsl(355deg, 52%, 48%); + + --ipa-font: Charis; } :root { @@ -91,6 +94,9 @@ ul li { .ipa, .lang { - font-family: Andika; - font-feature-settings: "ss01" 1, "litr" 0; + font-family: var(--ipa-font); +} + +.lang { + font-weight: 500; }