Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(theme): update Inter to version 4 (#3693) #3694

Merged
merged 5 commits into from
Apr 2, 2024
Merged

feat(theme): update Inter to version 4 (#3693) #3694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
560c256
feat: update Inter to version 4 (#3693)
GabsEdits Mar 23, 2024
e383110
feat(theme): Updated Inter to version 4
GabsEdits Mar 24, 2024
eb763d5
Merge branch 'main' into main
brc-dd Apr 2, 2024
2ac6e6a
update font files, restore italics, add missing glyphs
brc-dd Apr 2, 2024
7934146
remove comments
brc-dd Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/client/theme-default/fonts/inter-italic-cyrillic-ext.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-italic-cyrillic.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-italic-greek-ext.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-italic-greek.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-italic-latin-ext.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-italic-latin.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-italic-vietnamese.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-cyrillic-ext.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-cyrillic.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-greek-ext.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-greek.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-latin-ext.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-latin.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified src/client/theme-default/fonts/inter-roman-vietnamese.woff2
View file
Open in desktop
Binary file not shown.
136 changes: 64 additions & 72 deletions src/client/theme-default/styles/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,153 +7,143 @@ html body {
/* webfont-marker-end */

@font-face {
font-family: 'Inter var';
font-weight: 100 900;
font-display: swap;
font-family: Inter;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-cyrillic.woff2') format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}

@font-face {
font-family: 'Inter var';
font-weight: 100 900;
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-cyrillic-ext.woff2') format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: normal;
font-weight: 100 900;
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-greek.woff2') format('woff2');
unicode-range: U+0370-03FF;
src: url('../fonts/inter-roman-cyrillic.woff2') format('woff2');
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;
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-greek-ext.woff2') format('woff2');
unicode-range: U+1F00-1FFF;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: normal;
font-weight: 100 900;
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-latin.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;
src: url('../fonts/inter-roman-greek.woff2') format('woff2');
unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1,
U+03A3-03FF;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: normal;
font-weight: 100 900;
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-latin-ext.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;
src: url('../fonts/inter-roman-vietnamese.woff2') format('woff2');
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 var';
font-family: Inter;
font-style: normal;
font-weight: 100 900;
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url('../fonts/inter-roman-vietnamese.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;
src: url('../fonts/inter-roman-latin-ext.woff2') format('woff2');
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 var';
font-family: Inter;
font-style: normal;
font-weight: 100 900;
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url('../fonts/inter-italic-cyrillic.woff2') format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
src: url('../fonts/inter-roman-latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: italic;
font-weight: 100 900;
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url('../fonts/inter-italic-cyrillic-ext.woff2') format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: italic;
font-weight: 100 900;
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url('../fonts/inter-italic-greek.woff2') format('woff2');
unicode-range: U+0370-03FF;
src: url('../fonts/inter-italic-cyrillic.woff2') format('woff2');
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;
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url('../fonts/inter-italic-greek-ext.woff2') format('woff2');
unicode-range: U+1F00-1FFF;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: italic;
font-weight: 100 900;
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url('../fonts/inter-italic-latin.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;
src: url('../fonts/inter-italic-greek.woff2') format('woff2');
unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1,
U+03A3-03FF;
}

@font-face {
font-family: 'Inter var';
font-family: Inter;
font-style: italic;
font-weight: 100 900;
font-display: swap;
src: url('../fonts/inter-italic-vietnamese.woff2') format('woff2');
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-named-instance: 'Italic';
font-weight: 100 900;
font-display: swap;
src: url('../fonts/inter-italic-latin-ext.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;
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 var';
font-family: Inter;
font-style: italic;
font-weight: 100 900;
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url('../fonts/inter-italic-vietnamese.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;
src: url('../fonts/inter-italic-latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/* Chinese quotes rendering fix. 中英文弯引号共享 Unicode 码位，确保引号使用中文字体渲染 */
Expand All @@ -163,3 +153,5 @@ html body {
local('Source Han Sans SC');
unicode-range: U+2018, U+2019, U+201C, U+201D; /* 分别是 ‘’“” */
}

/* Generate the subsetted fonts using: `pyftsubset <file>.woff2 --unicodes="<range>" --output-file="inter-<style>-<subset>.woff2" --flavor=woff2` */
13 changes: 7 additions & 6 deletions src/client/theme-default/styles/vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,13 @@
* -------------------------------------------------------------------------- */

:root {
--vp-font-family-base: 'Chinese Quotes', 'Inter var', 'Inter', ui-sans-serif,
system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
'Helvetica Neue', Helvetica, Arial, 'Noto Sans', sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
--vp-font-family-mono: ui-monospace, SFMono-Regular, 'SF Mono', Menlo, Monaco,
Consolas, 'Liberation Mono', 'Courier New', monospace;
--vp-font-family-base: 'Chinese Quotes', Inter, ui-sans-serif, system-ui,
sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
'Noto Color Emoji';
--vp-font-family-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
'Liberation Mono', 'Courier New', monospace;
font-optical-sizing: auto;
}

/**
Expand Down