diff --git a/_sass/_config.scss b/_sass/_config.scss index 72b9b32..98b5a42 100644 --- a/_sass/_config.scss +++ b/_sass/_config.scss @@ -37,14 +37,14 @@ $body-background-color: hsl($hue,3,96); // hsl($hue,25,95); // @import url('https://fonts.googleapis.com/css?family=Bree+Serif'); $sans-serif: Helvetica, Arial, sans-serif; -$serif: xGeorgia, Times, serif; +$serif: "Noto Serif", Times, serif; $header-serif: "Bree Serif",$serif; -$body-serif: "Bree Serif",$serif; +$body-serif: "Noto Serif", "Bree Serif",$serif; $header-color: darken($body-background-color,80%); $header-link-color: darken($body-background-color,70%); -$image-caption-serif: "Neucha", $sans-serif; +$image-caption-serif: "Fira Sans Extra Condensed", "Neucha", $sans-serif; $image-caption-color: $body-color; $main-link-color: darken($body-background-color,80%); @@ -102,4 +102,123 @@ $local-google-fonts: true; // TODO font-weight: 400; src: local('Neucha'), url(../fonts/Neucha/q5uGsou0JOdh94bfvQltKRZUgQ.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +// Fira Sans Extra Condensed +// https://fonts.googleapis.com/css?family=Fira%20Sans%20Extra%20Condensed +/* cyrillic-ext */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fKuulWcrE5Hcg.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fuuulWcrE5Hcg.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fOuulWcrE5Hcg.woff2) format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fyuulWcrE5Hcg.woff2) format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fCuulWcrE5Hcg.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fGuulWcrE5Hcg.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Fira Sans Extra Condensed'; + font-style: normal; + font-weight: 400; + src: local('Fira Sans Extra Condensed Regular'), local('FiraSansExtraCondensed-Regular'), url(../fonts/Fira%20Sans%20Extra%20Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1f-uulWcrE4.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + + +// Noto Serif +// https://fonts.googleapis.com/css?family=Noto%20Serif +/* cyrillic-ext */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFoWaDq8fMVxMw.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFMWaDq8fMVxMw.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFsWaDq8fMVxMw.woff2) format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFQWaDq8fMVxMw.woff2) format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFgWaDq8fMVxMw.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFkWaDq8fMVxMw.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Noto Serif'; + font-style: normal; + font-weight: 400; + src: local('Noto Serif'), local('NotoSerif'), url(../fonts/Noto%20Serif/ga6Iaw1J5X9T9RW6j9bNfFcWaDq8fMU.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } \ No newline at end of file diff --git a/_sass/_isabelline.scss b/_sass/_isabelline.scss index 020de7c..5c7bbd7 100644 --- a/_sass/_isabelline.scss +++ b/_sass/_isabelline.scss @@ -116,7 +116,7 @@ main, header, footer { } body { - font-family: $serif; + font-family: $body-serif; font-size: 1.3em; color: $body-color; background-color: $body-background-color; @@ -176,7 +176,7 @@ a { main { p { margin: 1em 0; - line-height: 1.2em; + line-height: 1.3em; code { // TODO: need better styling diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1f-uulWcrE4.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1f-uulWcrE4.woff2 new file mode 100644 index 0000000..a04bfbf Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1f-uulWcrE4.woff2 differ diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fCuulWcrE5Hcg.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fCuulWcrE5Hcg.woff2 new file mode 100644 index 0000000..71af754 Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fCuulWcrE5Hcg.woff2 differ diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fGuulWcrE5Hcg.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fGuulWcrE5Hcg.woff2 new file mode 100644 index 0000000..4899fae Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fGuulWcrE5Hcg.woff2 differ diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fKuulWcrE5Hcg.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fKuulWcrE5Hcg.woff2 new file mode 100644 index 0000000..c366016 Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fKuulWcrE5Hcg.woff2 differ diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fOuulWcrE5Hcg.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fOuulWcrE5Hcg.woff2 new file mode 100644 index 0000000..073b5a5 Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fOuulWcrE5Hcg.woff2 differ diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fuuulWcrE5Hcg.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fuuulWcrE5Hcg.woff2 new file mode 100644 index 0000000..5b584c6 Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fuuulWcrE5Hcg.woff2 differ diff --git a/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fyuulWcrE5Hcg.woff2 b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fyuulWcrE5Hcg.woff2 new file mode 100644 index 0000000..3e4c76d Binary files /dev/null and b/assets/fonts/Fira Sans Extra Condensed/NaPKcYDaAO5dirw6IaFn7lPJFqXmS-M9Atn3wgda1fyuulWcrE5Hcg.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFMWaDq8fMVxMw.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFMWaDq8fMVxMw.woff2 new file mode 100644 index 0000000..68727c5 Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFMWaDq8fMVxMw.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFQWaDq8fMVxMw.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFQWaDq8fMVxMw.woff2 new file mode 100644 index 0000000..b7a711d Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFQWaDq8fMVxMw.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFcWaDq8fMU.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFcWaDq8fMU.woff2 new file mode 100644 index 0000000..15c4f04 Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFcWaDq8fMU.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFgWaDq8fMVxMw.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFgWaDq8fMVxMw.woff2 new file mode 100644 index 0000000..8b17656 Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFgWaDq8fMVxMw.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFkWaDq8fMVxMw.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFkWaDq8fMVxMw.woff2 new file mode 100644 index 0000000..aa0a441 Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFkWaDq8fMVxMw.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFoWaDq8fMVxMw.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFoWaDq8fMVxMw.woff2 new file mode 100644 index 0000000..04bb41b Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFoWaDq8fMVxMw.woff2 differ diff --git a/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFsWaDq8fMVxMw.woff2 b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFsWaDq8fMVxMw.woff2 new file mode 100644 index 0000000..437ec99 Binary files /dev/null and b/assets/fonts/Noto Serif/ga6Iaw1J5X9T9RW6j9bNfFsWaDq8fMVxMw.woff2 differ