diff --git a/build.sh b/build.sh index f479058..cb08c5c 100755 --- a/build.sh +++ b/build.sh @@ -26,7 +26,7 @@ fi find acl.cool/site/ ytheleus.org/site/ -type f \( -name '*.dj' -o -name '*.html' \) -exec cat {} + >all_chars.txt cat common_chars.txt >>all_chars.txt -for font in fonts/LiterataTT/LiterataTT-Subhead{Regular,Italic,Medium,MediumItalic,Bold,BoldItalic}.woff2 \ +for font in fonts/LiterataTT/LiterataTT-Subhead{Regular,Italic,Semibold,SemiboldItalic,Bold,BoldItalic}.woff2 \ fonts/JuliaMono/*{-Light,-Regular,-SemiBold}{,Italic}.woff2; do woff2_decompress "$font" ttf_font="${font%.woff2}.ttf" diff --git a/css/fonts.css b/css/fonts.css index cc0f6fb..458fbde 100644 --- a/css/fonts.css +++ b/css/fonts.css @@ -28,28 +28,28 @@ @font-face { font-family: 'Subheading'; - src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadMedium-Subset.woff2') format('woff2'); + src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadRegular-Subset.woff2') format('woff2'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Subheading'; - src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadMediumItalic-Subset.woff2') format('woff2'); + src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadItalic-Subset.woff2') format('woff2'); font-weight: normal; font-style: italic; } @font-face { font-family: 'Subheading'; - src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadBold-Subset.woff2') format('woff2'); + src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadSemibold-Subset.woff2') format('woff2'); font-weight: bold; font-style: normal; } @font-face { font-family: 'Subheading'; - src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadBoldItalic-Subset.woff2') format('woff2'); + src: url('../assets/fonts/LiterataTT/LiterataTT-SubheadSemiboldItalic-Subset.woff2') format('woff2'); font-weight: bold; font-style: italic; } @@ -206,9 +206,9 @@ h4, h5, h6 { font-family: "Subheading"; - font-weight: normal; line-height: var(--ui-spacing); font-optical-sizing: auto; + font-style: normal; } :root {