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

Jump to bottom

enhance(frontend): Include fonts in vite build #370

Merged
merged 1 commit into from
Sep 22, 2023
Merged

enhance(frontend): Include fonts in vite build #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"dependencies": {
"@discordapp/twemoji": "14.1.2",
"@fontsource/jetbrains-mono": "^5.0.12",
"@github/webauthn-json": "2.1.1",
"@rollup/plugin-alias": "5.0.0",
"@rollup/plugin-json": "6.0.0",
Expand Down Expand Up @@ -53,6 +54,8 @@
"json5": "2.2.3",
"matter-js": "0.19.0",
"photoswipe": "5.4.0",
"pretendard": "^1.3.8",
"pretendard-jp": "^1.3.8",
"prismjs": "1.29.0",
"punycode": "2.3.0",
"querystring": "0.2.1",
Expand Down
71 changes: 26 additions & 45 deletions packages/frontend/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,28 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/

@mixin font($font-family, $font-weight, $font-style, $font-local, $font-url) {
@font-face {
font-family: $font-family;
font-weight: $font-weight;
font-style: $font-style;
font-display: swap;
src: local($font-local), url($font-url) format('woff2');
}
}

@include font(
'Pretendard JP',
400,
normal,
'Pretendard JP Regular',
'https://cdn.jsdelivr.net/gh/orioncactus/pretendard/packages/pretendard-jp/dist/web/static/woff2/PretendardJP-Regular.woff2'
);
@include font(
'Pretendard JP',
700,
normal,
'Pretendard JP Bold',
'https://cdn.jsdelivr.net/gh/orioncactus/pretendard/packages/pretendard-jp/dist/web/static/woff2/PretendardJP-Bold.woff2'
);
@include font(
'JetBrains Mono',
400,
normal,
'JetBrains Mono Regular',
'https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono@master/fonts/webfonts/JetBrainsMono-Regular.woff2'
);
@include font(
'JetBrains Mono',
700,
normal,
'JetBrains Mono Bold',
'https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono@master/fonts/webfonts/JetBrainsMono-Bold.woff2'
);
@import "@fontsource/jetbrains-mono/100.css";
@import "@fontsource/jetbrains-mono/100-italic.css";
@import "@fontsource/jetbrains-mono/200.css";
@import "@fontsource/jetbrains-mono/200-italic.css";
@import "@fontsource/jetbrains-mono/300.css";
@import "@fontsource/jetbrains-mono/300-italic.css";
@import "@fontsource/jetbrains-mono/400.css";
@import "@fontsource/jetbrains-mono/400-italic.css";
@import "@fontsource/jetbrains-mono/500.css";
@import "@fontsource/jetbrains-mono/500-italic.css";
@import "@fontsource/jetbrains-mono/600.css";
@import "@fontsource/jetbrains-mono/600-italic.css";
@import "@fontsource/jetbrains-mono/700.css";
@import "@fontsource/jetbrains-mono/700-italic.css";
@import "@fontsource/jetbrains-mono/800.css";
@import "@fontsource/jetbrains-mono/800-italic.css";
@import "pretendard/dist/web/static/pretendard-dynamic-subset.css";
@import "pretendard-jp/dist/web/static/pretendard-jp-dynamic-subset.css";

$default-font: "Pretendard JP", Pretendard, -apple-system, BlinkMacSystemFont, system-ui, Roboto, "Helvetica Neue", "Segoe UI", "Hiragino Sans", "Apple SD Gothic Neo", Meiryo, "Noto Sans JP", "Noto Sans KR", "Malgun Gothic", Osaka, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;
$system-font: -apple-system, BlinkMacSystemFont, "Apple SD Gothic Neo", Roboto, "Noto Sans KR", "Segoe UI", "Malgun Gothic", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;
$monospace-font: "JetBrains Mono", "Pretendard JP", Pretendard, Fira code, Fira Mono, Consolas, Menlo, Courier, monospace !important;

:root {
--radius: 12px;
Expand Down Expand Up @@ -80,10 +64,7 @@ html {
accent-color: var(--accent);
overflow: auto;
overflow-wrap: break-word;
font-family: "Pretendard JP", Pretendard, -apple-system, BlinkMacSystemFont, system-ui,
Roboto, "Helvetica Neue", "Segoe UI", "Hiragino Sans", "Apple SD Gothic Neo",
Meiryo, "Noto Sans JP", "Noto Sans KR", "Malgun Gothic", Osaka,
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;
font-family: $default-font;
// incoming changes from v13
// font-family: 'Hiragino Maru Gothic Pro', "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
font-size: 14px;
Expand Down Expand Up @@ -199,7 +180,7 @@ html {
}

&.useSystemFont {
font-family: system-ui;
font-family: $system-font;
}
}

Expand Down Expand Up @@ -515,12 +496,12 @@ hr {
}

._monospace {
font-family: "Pretendard JP", "JetBrains Mono", Fira code, Fira Mono, Consolas, Menlo, Courier, monospace !important;
font-family: $monospace-font
}

code[class*="language-"],
pre[class*="language-"] {
font-family: "JetBrains Mono", "Pretendard JP" , Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace !important;
font-family: $monospace-font
}

.prism-editor__textarea:focus {
Expand Down
21 changes: 21 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.