SWREI/switched
0
0
Fork 0
Code

Custom Fonts

Browse Source
This commit is contained in:
caipira113 2024-08-19 19:44:06 +09:00
parent aaf560f747
commit dd58eacac0
No known key found for this signature in database
9 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/frontend/package.json
View File

@ -18,6 +18,7 @@
},
"dependencies": {
"@discordapp/twemoji": "15.0.3",
"@fontsource/jetbrains-mono": "^5.0.21",
"@github/webauthn-json": "2.1.1",
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
"@misskey-dev/browser-image-resizer": "2024.1.0",
@ -56,6 +57,8 @@
"misskey-js": "workspace:*",
"misskey-reversi": "workspace:*",
"photoswipe": "5.4.4",
"pretendard": "^1.3.9",
"pretendard-jp": "^1.3.9",
"punycode": "2.3.1",
"rollup": "4.19.1",
"sanitize-html": "2.13.0",

2
packages/frontend/src/components/MkAsUi.vue
View File

@ -138,7 +138,7 @@ function openPostForm() {
}
.fontMonospace {
font-family: Fira code, Fira Mono, Consolas, Menlo, Courier, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Fira code, Fira Mono, Consolas, Menlo, Courier, monospace;
}
.postForm {

4
packages/frontend/src/components/MkCode.core.vue
View File

@ -78,7 +78,7 @@ watch(() => props.lang, (to) => {
overflow: auto;
border-radius: 8px;
border: 1px solid var(--divider);
font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
color: var(--shiki-fallback);
background-color: var(--shiki-fallback-bg);
@ -90,7 +90,7 @@ watch(() => props.lang, (to) => {
& pre,
& code {
font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
}
}

2
packages/frontend/src/components/MkCode.vue
View File

@ -74,7 +74,7 @@ function copy() {
}
.codeBlockFallbackCode {
font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
}
.codePlaceholderRoot {

4
packages/frontend/src/components/MkCodeEditor.vue
View File

@ -163,7 +163,7 @@ watch(v, newValue => {
color: var(--fg);
border: solid 1px var(--panel);
transition: border-color 0.1s ease-out;
font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
&:hover {
border-color: var(--inputBorderHover) !important;
}
@ -207,7 +207,7 @@ watch(v, newValue => {
padding: 12px;
line-height: 1.5em;
font-size: 1em;
font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
}
.textarea::selection {

2
packages/frontend/src/components/MkCodeInline.vue
View File

@ -16,7 +16,7 @@ const props = defineProps<{
<style module lang="scss">
.root {
display: inline-block;
font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
overflow-wrap: anywhere;
background: var(--bg);
padding: .1em;

4
packages/frontend/src/scripts/theme.ts
View File

@ -8,8 +8,8 @@ import tinycolor from 'tinycolor2';
import { deepClone } from './clone.js';
import type { BundledTheme } from 'shiki/themes';
import { globalEvents } from '@/events.js';
import lightTheme from '@/themes/l-stella-r2.json5';
import darkTheme from '@/themes/d-stella-r2.json5';
import lightTheme from '@/themes/_light.json5';
import darkTheme from '@/themes/_dark.json5';
import { miLocalStorage } from '@/local-storage.js';
export type Theme = {

16
packages/frontend/src/style.scss
View File

@ -6,6 +6,16 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
@import "@fontsource/jetbrains-mono/index.css";
@import "pretendard/dist/web/static/pretendard.css";
@import "pretendard-jp/dist/web/static/pretendard-jp.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;
--marginFull: 16px;
@ -42,7 +52,7 @@ html {
accent-color: var(--accent);
overflow: auto;
overflow-wrap: break-word;
font-family: 'Hiragino Maru Gothic Pro', "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
font-family: $default-font;
font-size: 14px;
line-height: 1.35;
text-size-adjust: 100%;
@ -88,7 +98,7 @@ html {
}
&.useSystemFont {
font-family: system-ui;
font-family: $system-font;
}
}
@ -428,7 +438,7 @@ rt {
}
._monospace {
font-family: Fira code, Fira Mono, Consolas, Menlo, Courier, monospace !important;
font-family: $monospace-font
}
._zoom {

26
pnpm-lock.yaml
View File

@ -691,6 +691,9 @@ importers:
'@discordapp/twemoji':
specifier: 15.0.3
version: 15.0.3
'@fontsource/jetbrains-mono':
specifier: ^5.0.21
version: 5.0.21
'@github/webauthn-json':
specifier: 2.1.1
version: 2.1.1
@ -805,6 +808,12 @@ importers:
photoswipe:
specifier: 5.4.4
version: 5.4.4
pretendard:
specifier: ^1.3.9
version: 1.3.9
pretendard-jp:
specifier: ^1.3.9
version: 1.3.9
punycode:
specifier: 2.3.1
version: 2.3.1
@ -2879,6 +2888,9 @@ packages:
'@fastify/view@9.1.0':
resolution: {integrity: sha512-jRTGDljs/uB2p8bf6c1x4stGjP7H84VQkhbtDgCx55Mxf9Fplud5UZIHubvL4BTTX8jNYEzP1FpNAOBi7vibxg==}
'@fontsource/jetbrains-mono@5.0.21':
resolution: {integrity: sha512-BjI7a4U4HC4R3rEq96dN4CKtH8qxHFA+zU+6Ftusn/9k+VbF+VZ1l5bmHCUtg2ekjXbGF955/1FODlCKXleaGQ==}
'@github/webauthn-json@2.1.1':
resolution: {integrity: sha512-XrftRn4z75SnaJOmZQbt7Mk+IIjqVHw+glDGOxuHwXkZBZh/MBoRS7MHjSZMDaLhT4RjN2VqiEU7EOYleuJWSQ==}
hasBin: true
@ -7804,6 +7816,7 @@ packages:
inflight@1.0.6:
resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
inherits@2.0.4:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
@ -9884,6 +9897,12 @@ packages:
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
pretendard-jp@1.3.9:
resolution: {integrity: sha512-F00fRLyHa9IQh80hj80Z3wEDamD1gFStFKY2yQUdugQp+54mk7LEEuB3uRxgWk2EMLvigr2Zc34hKTe2X9okuQ==}
pretendard@1.3.9:
resolution: {integrity: sha512-PaQAADyLY5v4kYFwkpSJHbSSYIkiriY/1xXw75TKoZ9UQQqeU+tvP05yTdZAWibiIYoo8ZKtRv8PM7w0IaywSw==}
prettier@3.3.3:
resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
engines: {node: '>=14'}
@ -11115,7 +11134,6 @@ packages:
ts-case-convert@2.0.2:
resolution: {integrity: sha512-vdKfx1VAdpvEBOBv5OpVu5ZFqRg9HdTI4sYt6qqMeICBeNyXvitrarCnFWNDAki51IKwCyx+ZssY46Q9jH5otA==}
bundledDependencies: []
ts-dedent@2.2.0:
resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
@ -14021,6 +14039,8 @@ snapshots:
fastify-plugin: 4.5.0
toad-cache: 3.7.0
'@fontsource/jetbrains-mono@5.0.21': {}
'@github/webauthn-json@2.1.1': {}
'@hapi/boom@10.0.1':
@ -22763,6 +22783,10 @@ snapshots:
prelude-ls@1.2.1: {}
pretendard-jp@1.3.9: {}
pretendard@1.3.9: {}
prettier@3.3.3: {}
pretty-bytes@5.6.0: {}