diff --git a/package-lock.json b/package-lock.json index 49751dc1..0d3d265f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,10 +13,6 @@ "devDependencies": { "@electron/rebuild": "^4.0.2", "@eslint/js": "^9.39.2", - "@fontsource/noto-sans-jp": "^5.2.8", - "@fontsource/noto-sans-kr": "^5.2.8", - "@fontsource/noto-sans-sc": "^5.2.8", - "@fontsource/noto-sans-tc": "^5.2.8", "@kamiya4047/eslint-plugin-pretty-import": "^0.1.6", "@sentry/vite-plugin": "^4.6.1", "@sentry/vue": "^10.32.1", @@ -2339,46 +2335,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@fontsource/noto-sans-jp": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans-jp/-/noto-sans-jp-5.2.8.tgz", - "integrity": "sha512-ngWXPtSV3XH8ZmNX9hnfeQ+x/3mCoaAOA3BVDcyS5jQdh4FYqKjf/S9tEUEYDPwGa2pULJVXTO2+oFg42gWvSw==", - "dev": true, - "license": "OFL-1.1", - "funding": { - "url": "https://github.com/sponsors/ayuhito" - } - }, - "node_modules/@fontsource/noto-sans-kr": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans-kr/-/noto-sans-kr-5.2.8.tgz", - "integrity": "sha512-2Nbu2Iy1YGUkHbOTF8mMchipbg8g4ZBTpUzHwg09/dz/9b7r5o5h2PF6hnbismsBp8GzpsBA66OlQJw3GZehuw==", - "dev": true, - "license": "OFL-1.1", - "funding": { - "url": "https://github.com/sponsors/ayuhito" - } - }, - "node_modules/@fontsource/noto-sans-sc": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans-sc/-/noto-sans-sc-5.2.8.tgz", - "integrity": "sha512-8T8HxIS3uAMCfaQawKRH/6yYZ1oRnJZB/CrGwfxGgJa+zAOBgx2lqZMiTY/WbQpLGlPRqX4zHXJYI09CI2q6tA==", - "dev": true, - "license": "OFL-1.1", - "funding": { - "url": "https://github.com/sponsors/ayuhito" - } - }, - "node_modules/@fontsource/noto-sans-tc": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans-tc/-/noto-sans-tc-5.2.8.tgz", - "integrity": "sha512-YGeoh/XCBJm9iSUuyDIpw0pd7I+XiO7HI3Tq+38j4fuIjykURHhUDRtjkIFkEzjg8BKZ6MNdyyXHXor1fdoGQg==", - "dev": true, - "license": "OFL-1.1", - "funding": { - "url": "https://github.com/sponsors/ayuhito" - } - }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -13469,7 +13425,6 @@ "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "jiti": "lib/jiti-cli.mjs" } @@ -13623,7 +13578,6 @@ "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==", "dev": true, "license": "MPL-2.0", - "peer": true, "dependencies": { "detect-libc": "^2.0.3" }, diff --git a/package.json b/package.json index 4cb17721..7162fae6 100644 --- a/package.json +++ b/package.json @@ -34,10 +34,6 @@ "devDependencies": { "@electron/rebuild": "^4.0.2", "@eslint/js": "^9.39.2", - "@fontsource/noto-sans-jp": "^5.2.8", - "@fontsource/noto-sans-kr": "^5.2.8", - "@fontsource/noto-sans-sc": "^5.2.8", - "@fontsource/noto-sans-tc": "^5.2.8", "@kamiya4047/eslint-plugin-pretty-import": "^0.1.6", "@sentry/vite-plugin": "^4.6.1", "@sentry/vue": "^10.32.1", diff --git a/src/app.css b/src/app.css index e699ddc7..eb656ee6 100644 --- a/src/app.css +++ b/src/app.css @@ -8,24 +8,16 @@ For a copy, see . @import 'tailwindcss'; -@import '@fontsource/noto-sans-kr/korean.css'; -@import '@fontsource/noto-sans-jp/japanese.css'; -@import '@fontsource/noto-sans-sc/chinese-simplified.css'; -@import '@fontsource/noto-sans-tc/chinese-traditional.css'; -@import '@fontsource/noto-sans-kr'; -@import '@fontsource/noto-sans-jp'; -@import '@fontsource/noto-sans-sc'; -@import '@fontsource/noto-sans-tc'; - @import 'element-plus/dist/index.css'; - -@import './assets/scss/flags.css'; -@import './assets/scss/animated-emoji.css'; @import 'element-plus/theme-chalk/dark/css-vars.css'; @import 'animate.css/animate.min.css'; @import 'noty/lib/noty.css'; @import 'remixicon/fonts/remixicon.css'; +@import './assets/scss/flags.css'; +@import './assets/scss/animated-emoji.css'; +@import './assets/scss/fonts.css'; + :root { text-autospace: normal; } diff --git a/src/assets/scss/fonts.css b/src/assets/scss/fonts.css new file mode 100644 index 00000000..8caa57bb --- /dev/null +++ b/src/assets/scss/fonts.css @@ -0,0 +1,145 @@ +/* noto-sans-tc-regular - chinese-traditional */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans TC'; + font-style: normal; + font-weight: 400; + src: url('/fonts/noto-sans-tc-v38-chinese-traditional-regular.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-tc-500 - chinese-traditional */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans TC'; + font-style: normal; + font-weight: 500; + src: url('/fonts/noto-sans-tc-v38-chinese-traditional-500.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-tc-600 - chinese-traditional */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans TC'; + font-style: normal; + font-weight: 600; + src: url('/fonts/noto-sans-tc-v38-chinese-traditional-600.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-tc-700 - chinese-traditional */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans TC'; + font-style: normal; + font-weight: 700; + src: url('/fonts/noto-sans-tc-v38-chinese-traditional-700.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* noto-sans-sc-regular - chinese-simplified */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans SC'; + font-style: normal; + font-weight: 400; + src: url('/fonts/noto-sans-sc-v39-chinese-simplified-regular.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-sc-500 - chinese-simplified */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans SC'; + font-style: normal; + font-weight: 500; + src: url('/fonts/noto-sans-sc-v39-chinese-simplified-500.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-sc-600 - chinese-simplified */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans SC'; + font-style: normal; + font-weight: 600; + src: url('/fonts/noto-sans-sc-v39-chinese-simplified-600.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-sc-700 - chinese-simplified */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans SC'; + font-style: normal; + font-weight: 700; + src: url('/fonts/noto-sans-sc-v39-chinese-simplified-700.woff2') + format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* noto-sans-jp-regular - japanese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans JP'; + font-style: normal; + font-weight: 400; + src: url('/fonts/noto-sans-jp-v55-japanese-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-jp-500 - japanese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans JP'; + font-style: normal; + font-weight: 500; + src: url('/fonts/noto-sans-jp-v55-japanese-500.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-jp-600 - japanese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans JP'; + font-style: normal; + font-weight: 600; + src: url('/fonts/noto-sans-jp-v55-japanese-600.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-jp-700 - japanese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans JP'; + font-style: normal; + font-weight: 700; + src: url('/fonts/noto-sans-jp-v55-japanese-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* noto-sans-kr-regular - korean */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans KR'; + font-style: normal; + font-weight: 400; + src: url('/fonts/noto-sans-kr-v38-korean-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-kr-500 - korean */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans KR'; + font-style: normal; + font-weight: 500; + src: url('/fonts/noto-sans-kr-v38-korean-500.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-kr-600 - korean */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans KR'; + font-style: normal; + font-weight: 600; + src: url('/fonts/noto-sans-kr-v38-korean-600.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* noto-sans-kr-700 - korean */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Noto Sans KR'; + font-style: normal; + font-weight: 700; + src: url('/fonts/noto-sans-kr-v38-korean-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +@font-face { + font-family: 'ellipsis-font'; + src: local('Times New Roman'); + unicode-range: U+2026; +} diff --git a/src/public/fonts/noto-sans-jp-v55-japanese-500.woff2 b/src/public/fonts/noto-sans-jp-v55-japanese-500.woff2 new file mode 100644 index 00000000..50ebb377 Binary files /dev/null and b/src/public/fonts/noto-sans-jp-v55-japanese-500.woff2 differ diff --git a/src/public/fonts/noto-sans-jp-v55-japanese-600.woff2 b/src/public/fonts/noto-sans-jp-v55-japanese-600.woff2 new file mode 100644 index 00000000..c5ed43b6 Binary files /dev/null and b/src/public/fonts/noto-sans-jp-v55-japanese-600.woff2 differ diff --git a/src/public/fonts/noto-sans-jp-v55-japanese-700.woff2 b/src/public/fonts/noto-sans-jp-v55-japanese-700.woff2 new file mode 100644 index 00000000..7836ad04 Binary files /dev/null and b/src/public/fonts/noto-sans-jp-v55-japanese-700.woff2 differ diff --git a/src/public/fonts/noto-sans-jp-v55-japanese-regular.woff2 b/src/public/fonts/noto-sans-jp-v55-japanese-regular.woff2 new file mode 100644 index 00000000..8da9e523 Binary files /dev/null and b/src/public/fonts/noto-sans-jp-v55-japanese-regular.woff2 differ diff --git a/src/public/fonts/noto-sans-kr-v38-korean-500.woff2 b/src/public/fonts/noto-sans-kr-v38-korean-500.woff2 new file mode 100644 index 00000000..5609d5d6 Binary files /dev/null and b/src/public/fonts/noto-sans-kr-v38-korean-500.woff2 differ diff --git a/src/public/fonts/noto-sans-kr-v38-korean-600.woff2 b/src/public/fonts/noto-sans-kr-v38-korean-600.woff2 new file mode 100644 index 00000000..dda1dc39 Binary files /dev/null and b/src/public/fonts/noto-sans-kr-v38-korean-600.woff2 differ diff --git a/src/public/fonts/noto-sans-kr-v38-korean-700.woff2 b/src/public/fonts/noto-sans-kr-v38-korean-700.woff2 new file mode 100644 index 00000000..b8c5346b Binary files /dev/null and b/src/public/fonts/noto-sans-kr-v38-korean-700.woff2 differ diff --git a/src/public/fonts/noto-sans-kr-v38-korean-regular.woff2 b/src/public/fonts/noto-sans-kr-v38-korean-regular.woff2 new file mode 100644 index 00000000..f1cdaf9a Binary files /dev/null and b/src/public/fonts/noto-sans-kr-v38-korean-regular.woff2 differ diff --git a/src/public/fonts/noto-sans-sc-v39-chinese-simplified-500.woff2 b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-500.woff2 new file mode 100644 index 00000000..2ce11f2b Binary files /dev/null and b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-500.woff2 differ diff --git a/src/public/fonts/noto-sans-sc-v39-chinese-simplified-600.woff2 b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-600.woff2 new file mode 100644 index 00000000..69956eb9 Binary files /dev/null and b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-600.woff2 differ diff --git a/src/public/fonts/noto-sans-sc-v39-chinese-simplified-700.woff2 b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-700.woff2 new file mode 100644 index 00000000..8faaeb3f Binary files /dev/null and b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-700.woff2 differ diff --git a/src/public/fonts/noto-sans-sc-v39-chinese-simplified-regular.woff2 b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-regular.woff2 new file mode 100644 index 00000000..cea36473 Binary files /dev/null and b/src/public/fonts/noto-sans-sc-v39-chinese-simplified-regular.woff2 differ diff --git a/src/public/fonts/noto-sans-tc-v38-chinese-traditional-500.woff2 b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-500.woff2 new file mode 100644 index 00000000..71ed106f Binary files /dev/null and b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-500.woff2 differ diff --git a/src/public/fonts/noto-sans-tc-v38-chinese-traditional-600.woff2 b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-600.woff2 new file mode 100644 index 00000000..a34d661f Binary files /dev/null and b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-600.woff2 differ diff --git a/src/public/fonts/noto-sans-tc-v38-chinese-traditional-700.woff2 b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-700.woff2 new file mode 100644 index 00000000..6686b4e8 Binary files /dev/null and b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-700.woff2 differ diff --git a/src/public/fonts/noto-sans-tc-v38-chinese-traditional-regular.woff2 b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-regular.woff2 new file mode 100644 index 00000000..17a6db6c Binary files /dev/null and b/src/public/fonts/noto-sans-tc-v38-chinese-traditional-regular.woff2 differ diff --git a/src/vr/vr.css b/src/vr/vr.css index 9a448c37..2b8d00b2 100644 --- a/src/vr/vr.css +++ b/src/vr/vr.css @@ -8,21 +8,13 @@ For a copy, see . @import 'tailwindcss'; -@import '@fontsource/noto-sans-kr/korean.css'; -@import '@fontsource/noto-sans-jp/japanese.css'; -@import '@fontsource/noto-sans-sc/chinese-simplified.css'; -@import '@fontsource/noto-sans-tc/chinese-traditional.css'; -@import '@fontsource/noto-sans-kr'; -@import '@fontsource/noto-sans-jp'; -@import '@fontsource/noto-sans-sc'; -@import '@fontsource/noto-sans-tc'; - -@import '../assets/scss/flags.css'; - @import 'animate.css/animate.min.css'; @import 'noty/lib/noty.css'; @import 'remixicon/fonts/remixicon.css'; +@import '../assets/scss/flags.css'; +@import '../assets/scss/fonts.css'; + /* 마지노선인듯 화면 24px -> 나나 32