diff --git a/theme/src/client/fonts/inter-italic-cyrillic-ext.woff2 b/theme/src/client/fonts/inter-italic-cyrillic-ext.woff2 index 2a687296..b6b603d5 100644 Binary files a/theme/src/client/fonts/inter-italic-cyrillic-ext.woff2 and b/theme/src/client/fonts/inter-italic-cyrillic-ext.woff2 differ diff --git a/theme/src/client/fonts/inter-italic-cyrillic.woff2 b/theme/src/client/fonts/inter-italic-cyrillic.woff2 index f6403515..def40a4f 100644 Binary files a/theme/src/client/fonts/inter-italic-cyrillic.woff2 and b/theme/src/client/fonts/inter-italic-cyrillic.woff2 differ diff --git a/theme/src/client/fonts/inter-italic-greek-ext.woff2 b/theme/src/client/fonts/inter-italic-greek-ext.woff2 index 00218960..e070c3d3 100644 Binary files a/theme/src/client/fonts/inter-italic-greek-ext.woff2 and b/theme/src/client/fonts/inter-italic-greek-ext.woff2 differ diff --git a/theme/src/client/fonts/inter-italic-greek.woff2 b/theme/src/client/fonts/inter-italic-greek.woff2 index 71c265f8..a3c16ca4 100644 Binary files a/theme/src/client/fonts/inter-italic-greek.woff2 and b/theme/src/client/fonts/inter-italic-greek.woff2 differ diff --git a/theme/src/client/fonts/inter-italic-latin-ext.woff2 b/theme/src/client/fonts/inter-italic-latin-ext.woff2 index 9c1b9440..2210a899 100644 Binary files a/theme/src/client/fonts/inter-italic-latin-ext.woff2 and b/theme/src/client/fonts/inter-italic-latin-ext.woff2 differ diff --git a/theme/src/client/fonts/inter-italic-latin.woff2 b/theme/src/client/fonts/inter-italic-latin.woff2 index 01fcf207..790d62dc 100644 Binary files a/theme/src/client/fonts/inter-italic-latin.woff2 and b/theme/src/client/fonts/inter-italic-latin.woff2 differ diff --git a/theme/src/client/fonts/inter-italic-vietnamese.woff2 b/theme/src/client/fonts/inter-italic-vietnamese.woff2 index e4f788ee..1eec0775 100644 Binary files a/theme/src/client/fonts/inter-italic-vietnamese.woff2 and b/theme/src/client/fonts/inter-italic-vietnamese.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-cyrillic-ext.woff2 b/theme/src/client/fonts/inter-roman-cyrillic-ext.woff2 index 28593ccb..2cfe6153 100644 Binary files a/theme/src/client/fonts/inter-roman-cyrillic-ext.woff2 and b/theme/src/client/fonts/inter-roman-cyrillic-ext.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-cyrillic.woff2 b/theme/src/client/fonts/inter-roman-cyrillic.woff2 index a20adc16..e3886dd1 100644 Binary files a/theme/src/client/fonts/inter-roman-cyrillic.woff2 and b/theme/src/client/fonts/inter-roman-cyrillic.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-greek-ext.woff2 b/theme/src/client/fonts/inter-roman-greek-ext.woff2 index e3b0be76..36d67487 100644 Binary files a/theme/src/client/fonts/inter-roman-greek-ext.woff2 and b/theme/src/client/fonts/inter-roman-greek-ext.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-greek.woff2 b/theme/src/client/fonts/inter-roman-greek.woff2 index f790e047..2bed1e85 100644 Binary files a/theme/src/client/fonts/inter-roman-greek.woff2 and b/theme/src/client/fonts/inter-roman-greek.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-latin-ext.woff2 b/theme/src/client/fonts/inter-roman-latin-ext.woff2 index 715bd903..9a8d1e2b 100644 Binary files a/theme/src/client/fonts/inter-roman-latin-ext.woff2 and b/theme/src/client/fonts/inter-roman-latin-ext.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-latin.woff2 b/theme/src/client/fonts/inter-roman-latin.woff2 index a540b7af..07d3c53a 100644 Binary files a/theme/src/client/fonts/inter-roman-latin.woff2 and b/theme/src/client/fonts/inter-roman-latin.woff2 differ diff --git a/theme/src/client/fonts/inter-roman-vietnamese.woff2 b/theme/src/client/fonts/inter-roman-vietnamese.woff2 index 5a9f9cb9..57bdc22a 100644 Binary files a/theme/src/client/fonts/inter-roman-vietnamese.woff2 and b/theme/src/client/fonts/inter-roman-vietnamese.woff2 differ diff --git a/theme/src/client/styles/fonts.scss b/theme/src/client/styles/fonts.scss index a9ac7b04..84a1399d 100644 --- a/theme/src/client/styles/fonts.scss +++ b/theme/src/client/styles/fonts.scss @@ -1,25 +1,5 @@ -/* webfont-marker-begin */ -@import "https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap"; - -html body { - font-synthesis: style; -} - -/* webfont-marker-end */ - @font-face { - font-family: "Inter var"; - font-style: normal; - font-weight: 100 900; - src: url("../fonts/inter-roman-cyrillic.woff2") format("woff2"); - font-display: swap; - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; - - font-named-instance: "Regular"; -} - -@font-face { - font-family: "Inter var"; + font-family: Inter; font-style: normal; font-weight: 100 900; src: url("../fonts/inter-roman-cyrillic-ext.woff2") format("woff2"); @@ -31,34 +11,86 @@ html body { U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; - - font-named-instance: "Regular"; } @font-face { - font-family: "Inter var"; + font-family: Inter; font-style: normal; font-weight: 100 900; - src: url("../fonts/inter-roman-greek.woff2") format("woff2"); + src: url("../fonts/inter-roman-cyrillic.woff2") format("woff2"); font-display: swap; - unicode-range: U+0370-03FF; - - font-named-instance: "Regular"; + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @font-face { - font-family: "Inter var"; + font-family: Inter; font-style: normal; font-weight: 100 900; src: url("../fonts/inter-roman-greek-ext.woff2") format("woff2"); font-display: swap; unicode-range: U+1F00-1FFF; - - font-named-instance: "Regular"; } @font-face { - font-family: "Inter var"; + font-family: Inter; + font-style: normal; + font-weight: 100 900; + src: url("../fonts/inter-roman-greek.woff2") format("woff2"); + font-display: swap; + unicode-range: + U+0370-0377, + U+037A-037F, + U+0384-038A, + U+038C, + U+038E-03A1, + U+03A3-03FF; +} + +@font-face { + font-family: Inter; + font-style: normal; + font-weight: 100 900; + src: url("../fonts/inter-roman-vietnamese.woff2") format("woff2"); + font-display: swap; + unicode-range: + U+0102-0103, + U+0110-0111, + U+0128-0129, + U+0168-0169, + U+01A0-01A1, + U+01AF-01B0, + U+0300-0301, + U+0303-0304, + U+0308-0309, + U+0323, + U+0329, + U+1EA0-1EF9, + U+20AB; +} + +@font-face { + font-family: Inter; + font-style: normal; + font-weight: 100 900; + src: url("../fonts/inter-roman-latin-ext.woff2") format("woff2"); + font-display: swap; + unicode-range: + U+0100-02AF, + U+0304, + U+0308, + U+0329, + U+1E00-1E9F, + U+1EF2-1EFF, + U+2020, + U+20A0-20AB, + U+20AD-20C0, + U+2113, + U+2C60-2C7F, + U+A720-A7FF; +} + +@font-face { + font-family: Inter; font-style: normal; font-weight: 100 900; src: url("../fonts/inter-roman-latin.woff2") format("woff2"); @@ -71,6 +103,9 @@ html body { U+02C6, U+02DA, U+02DC, + U+0304, + U+0308, + U+0329, U+2000-206F, U+2074, U+20AC, @@ -81,62 +116,10 @@ html body { U+2215, U+FEFF, U+FFFD; - - font-named-instance: "Regular"; } @font-face { - font-family: "Inter var"; - font-style: normal; - font-weight: 100 900; - src: url("../fonts/inter-roman-latin-ext.woff2") format("woff2"); - font-display: swap; - 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; - - font-named-instance: "Regular"; -} - -@font-face { - font-family: "Inter var"; - font-style: normal; - font-weight: 100 900; - src: url("../fonts/inter-roman-vietnamese.woff2") format("woff2"); - font-display: swap; - 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; - - font-named-instance: "Regular"; -} - -@font-face { - font-family: "Inter var"; - font-style: italic; - font-weight: 100 900; - src: url("../fonts/inter-italic-cyrillic.woff2") format("woff2"); - font-display: swap; - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; - - font-named-instance: "Italic"; -} - -@font-face { - font-family: "Inter var"; + font-family: Inter; font-style: italic; font-weight: 100 900; src: url("../fonts/inter-italic-cyrillic-ext.woff2") format("woff2"); @@ -148,34 +131,86 @@ html body { U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; - - font-named-instance: "Italic"; } @font-face { - font-family: "Inter var"; + font-family: Inter; font-style: italic; font-weight: 100 900; - src: url("../fonts/inter-italic-greek.woff2") format("woff2"); + src: url("../fonts/inter-italic-cyrillic.woff2") format("woff2"); font-display: swap; - unicode-range: U+0370-03FF; - - font-named-instance: "Italic"; + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @font-face { - font-family: "Inter var"; + font-family: Inter; font-style: italic; font-weight: 100 900; src: url("../fonts/inter-italic-greek-ext.woff2") format("woff2"); font-display: swap; unicode-range: U+1F00-1FFF; - - font-named-instance: "Italic"; } @font-face { - font-family: "Inter var"; + font-family: Inter; + font-style: italic; + font-weight: 100 900; + src: url("../fonts/inter-italic-greek.woff2") format("woff2"); + font-display: swap; + unicode-range: + U+0370-0377, + U+037A-037F, + U+0384-038A, + U+038C, + U+038E-03A1, + U+03A3-03FF; +} + +@font-face { + font-family: Inter; + font-style: italic; + font-weight: 100 900; + src: url("../fonts/inter-italic-vietnamese.woff2") format("woff2"); + font-display: swap; + unicode-range: + U+0102-0103, + U+0110-0111, + U+0128-0129, + U+0168-0169, + U+01A0-01A1, + U+01AF-01B0, + U+0300-0301, + U+0303-0304, + U+0308-0309, + U+0323, + U+0329, + U+1EA0-1EF9, + U+20AB; +} + +@font-face { + font-family: Inter; + font-style: italic; + font-weight: 100 900; + src: url("../fonts/inter-italic-latin-ext.woff2") format("woff2"); + font-display: swap; + unicode-range: + U+0100-02AF, + U+0304, + U+0308, + U+0329, + U+1E00-1E9F, + U+1EF2-1EFF, + U+2020, + U+20A0-20AB, + U+20AD-20C0, + U+2113, + U+2C60-2C7F, + U+A720-A7FF; +} + +@font-face { + font-family: Inter; font-style: italic; font-weight: 100 900; src: url("../fonts/inter-italic-latin.woff2") format("woff2"); @@ -188,6 +223,9 @@ html body { U+02C6, U+02DA, U+02DC, + U+0304, + U+0308, + U+0329, U+2000-206F, U+2074, U+20AC, @@ -198,47 +236,6 @@ html body { U+2215, U+FEFF, U+FFFD; - - font-named-instance: "Italic"; -} - -@font-face { - font-family: "Inter var"; - font-style: italic; - font-weight: 100 900; - src: url("../fonts/inter-italic-latin-ext.woff2") format("woff2"); - font-display: swap; - 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; - - font-named-instance: "Italic"; -} - -@font-face { - font-family: "Inter var"; - font-style: italic; - font-weight: 100 900; - src: url("../fonts/inter-italic-vietnamese.woff2") format("woff2"); - font-display: swap; - 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; - - font-named-instance: "Italic"; } /* Chinese quotes rendering fix. 中英文弯引号共享 Unicode 码位,确保引号使用中文字体渲染 */ @@ -251,3 +248,5 @@ html body { local("Source Han Sans SC"); unicode-range: U+2018, U+2019, U+201C, U+201D; /* 分别是 ‘’“” */ } + +/* Generate the subsetted fonts using: `pyftsubset .woff2 --unicodes="" --output-file="inter-