diff --git a/assets/css/style.css b/assets/css/style.css index 6ef6203..09a21ae 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -25,7 +25,7 @@ html { body { margin: 0px; padding: 0px; - font-family: "Merriweather",Georgia,Times,"Times New Roman",serif; + font-family: "Merriweather",Georgia,Times,"Times New Roman",serif,Symbola; color: var(--color-text); text-rendering: optimizeLegibility; font-feature-settings: "kern", "liga", "dlig", "salt"; diff --git a/assets/css/typo.css b/assets/css/typo.css index 9d18428..7d83f7c 100644 --- a/assets/css/typo.css +++ b/assets/css/typo.css @@ -1,37 +1,11 @@ -/* cyrillic-ext */ -@font-face { - font-family: 'Merriweather'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff1jvzRPA.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: 'Merriweather'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff8jvzRPA.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Merriweather'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff3jvzRPA.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; -} +/** ITALIQUE **/ /* latin-ext */ @font-face { font-family: 'Merriweather'; font-style: italic; font-weight: 300; font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff2jvzRPA.woff2) format('woff2'); + src: local('Merriweather'), url(/assets/fonts/MerriweatherItalicLatinExt.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 */ @@ -40,142 +14,53 @@ font-style: italic; font-weight: 300; font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff4jvw.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; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Merriweather'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf1jvzRPA.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: 'Merriweather'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf8jvzRPA.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Merriweather'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf3jvzRPA.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: 'Merriweather'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf2jvzRPA.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: 'Merriweather'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf4jvw.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; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVcf6lvg.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: 'Merriweather'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZXMf6lvg.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZV8f6lvg.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: 'Merriweather'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVsf6lvg.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: 'Merriweather'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZWMf6.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; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVcf6lvg.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: 'Merriweather'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZXMf6lvg.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZV8f6lvg.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: 'Merriweather'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVsf6lvg.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: 'Merriweather'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZWMf6.woff2) format('woff2'); + src: local('Merriweather'), url(/assets/fonts/MerriweatherItalicLatin.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; } +/** NORMAL **/ +/* latin-ext */ +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: local('Merriweather'), url(/assets/fonts/MerriweatherRegularLatinExt.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: 'Merriweather'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: local('Merriweather'), url(/assets/fonts/MerriweatherRegularLatin.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; +} + +/** GRAS **/ +/* latin-ext */ +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Merriweather'), url(/assets/fonts/MerriweatherBoldLatinExt.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: 'Merriweather'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Merriweather'), url(/assets/fonts/MerriweatherBoldLatin.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; +} + +/** SYMBOLES **/ +@font-face { + font-family: 'Symbola'; + font-display: swap; + src: local('Symbola'), url(/assets/fonts/Symbola.ttf) format('truetype'); +} diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZWMf6.woff2 b/assets/fonts/MerriweatherBoldLatin.woff2 similarity index 100% rename from assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZWMf6.woff2 rename to assets/fonts/MerriweatherBoldLatin.woff2 diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVsf6lvg.woff2 b/assets/fonts/MerriweatherBoldLatinExt.woff2 similarity index 100% rename from assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVsf6lvg.woff2 rename to assets/fonts/MerriweatherBoldLatinExt.woff2 diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff4jvw.woff2 b/assets/fonts/MerriweatherItalicLatin.woff2 similarity index 100% rename from assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff4jvw.woff2 rename to assets/fonts/MerriweatherItalicLatin.woff2 diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff2jvzRPA.woff2 b/assets/fonts/MerriweatherItalicLatinExt.woff2 similarity index 100% rename from assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff2jvzRPA.woff2 rename to assets/fonts/MerriweatherItalicLatinExt.woff2 diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZWMf6.woff2 b/assets/fonts/MerriweatherRegularLatin.woff2 similarity index 100% rename from assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZWMf6.woff2 rename to assets/fonts/MerriweatherRegularLatin.woff2 diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVsf6lvg.woff2 b/assets/fonts/MerriweatherRegularLatinExt.woff2 similarity index 100% rename from assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVsf6lvg.woff2 rename to assets/fonts/MerriweatherRegularLatinExt.woff2 diff --git a/assets/fonts/Symbola.ttf b/assets/fonts/Symbola.ttf new file mode 100644 index 0000000..055f025 Binary files /dev/null and b/assets/fonts/Symbola.ttf differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf1jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf1jvzRPA.woff2 deleted file mode 100644 index 50541de..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf1jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf2jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf2jvzRPA.woff2 deleted file mode 100644 index abbc363..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf2jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf3jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf3jvzRPA.woff2 deleted file mode 100644 index 62179c7..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf3jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf4jvw.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf4jvw.woff2 deleted file mode 100644 index 051450d..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf4jvw.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf8jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf8jvzRPA.woff2 deleted file mode 100644 index a31db62..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR71Wvf8jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff1jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff1jvzRPA.woff2 deleted file mode 100644 index 24f59b9..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff1jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff3jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff3jvzRPA.woff2 deleted file mode 100644 index 16930ca..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff3jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff8jvzRPA.woff2 b/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff8jvzRPA.woff2 deleted file mode 100644 index b2b2558..0000000 Binary files a/assets/fonts/u-4l0qyriQwlOrhSvowK_l5-eR7lXff8jvzRPA.woff2 and /dev/null differ diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZV8f6lvg.woff2 b/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZV8f6lvg.woff2 deleted file mode 100644 index 6bd5694..0000000 Binary files a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZV8f6lvg.woff2 and /dev/null differ diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVcf6lvg.woff2 b/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVcf6lvg.woff2 deleted file mode 100644 index b867479..0000000 Binary files a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZVcf6lvg.woff2 and /dev/null differ diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZXMf6lvg.woff2 b/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZXMf6lvg.woff2 deleted file mode 100644 index f81c5de..0000000 Binary files a/assets/fonts/u-4n0qyriQwlOrhSvowK_l521wRZXMf6lvg.woff2 and /dev/null differ diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZV8f6lvg.woff2 b/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZV8f6lvg.woff2 deleted file mode 100644 index c4394a8..0000000 Binary files a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZV8f6lvg.woff2 and /dev/null differ diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVcf6lvg.woff2 b/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVcf6lvg.woff2 deleted file mode 100644 index 37ad47e..0000000 Binary files a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZVcf6lvg.woff2 and /dev/null differ diff --git a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZXMf6lvg.woff2 b/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZXMf6lvg.woff2 deleted file mode 100644 index 460b06e..0000000 Binary files a/assets/fonts/u-4n0qyriQwlOrhSvowK_l52xwNZXMf6lvg.woff2 and /dev/null differ