Skip to content

Commit

Permalink
Merge pull request #16 from EpicsDAO/improve/fonts
Browse files Browse the repository at this point in the history
use king Inter
  • Loading branch information
KishiTheMechanic authored Nov 24, 2023
2 parents 78a33ec + 85fd9f7 commit 4d2a6ea
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"toc": "Table of Contents",
"openMenu": "Open menu",
"closeMenu": "Close menu",
"media": "Media",
"copy": "Copy",
"copied": "Copied!",
"solvInstall": "Install solv",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ja/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"toc": "目次",
"openMenu": "メニューを開く",
"closeMenu": "メニューを閉じる",
"media": "メディア",
"copy": "コピー",
"copied": "コピーしました!",
"solvInstall": "solvのインストール",
Expand Down
8 changes: 4 additions & 4 deletions src/assets/styles/globals.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Orbitron:wght@300;400;500;700;800&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;700;800&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@300;400;500;700;800&display=swap');

@tailwind base;
Expand All @@ -7,9 +7,9 @@

@layer base {
html {
font-family: Orbitron, 'Noto Sans JP', ui-sans-serif, system-ui,
-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
font-family: Inter, 'Noto Sans JP', ui-sans-serif, system-ui, -apple-system,
BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', 'Noto Color Emoji';
scroll-padding-top: 104px;
}
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
},
extend: {
fontFamily: {
sans: ['Orbitron', 'Noto Sans JP', ...fontFamily.sans],
sans: ['Inter', 'Noto Sans JP', ...fontFamily.sans],
},
colors: {
discord: '#5865f2',
Expand Down

0 comments on commit 4d2a6ea

Please sign in to comment.