luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #504 from toeverything/feat/modify

Browse Source 
feat: add alternative font for windows
This commit is contained in:
Qi
2022-10-26 17:31:08 +08:00
committed by GitHub
parent d94a6956b2 6bd740b0a7
commit f0414efc79
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/app/package.json
View File

@@ -15,6 +15,7 @@
"@emotion/react": "^11.10.4", "@emotion/react": "^11.10.4",
"@emotion/server": "^11.10.0", "@emotion/server": "^11.10.0",
"@emotion/styled": "^11.10.4", "@emotion/styled": "^11.10.4",
"@fontsource/poppins": "^4.5.10",
"@fontsource/space-mono": "^4.5.10", "@fontsource/space-mono": "^4.5.10",
"@mui/base": "^5.0.0-alpha.87", "@mui/base": "^5.0.0-alpha.87",
"@mui/icons-material": "^5.10.9", "@mui/icons-material": "^5.10.9",

1
packages/app/src/pages/_app.tsx
View File

@@ -8,6 +8,7 @@ import { ModalProvider } from '@/components/global-modal-provider';
import { Logger } from '@toeverything/pathfinder-logger'; import { Logger } from '@toeverything/pathfinder-logger';
import '@fontsource/space-mono'; import '@fontsource/space-mono';
import '@fontsource/poppins';
const ThemeProvider = dynamic(() => import('@/styles/themeProvider'), { const ThemeProvider = dynamic(() => import('@/styles/themeProvider'), {
ssr: false, ssr: false,

2
packages/app/src/styles/theme.ts
View File

@@ -37,7 +37,7 @@ export const getLightTheme = (
xs: '12px', xs: '12px',
sm: '16px', sm: '16px',
base: '18px', base: '18px',
family: `Avenir Next, ${basicFontFamily}`, family: `Avenir Next, Poppins, ${basicFontFamily}`,
family2: `Space Mono, ${basicFontFamily}`, family2: `Space Mono, ${basicFontFamily}`,
lineHeightBase: '26px', lineHeightBase: '26px',
}, },

10
pnpm-lock.yaml generated
View File

@@ -24,6 +24,7 @@ importers:
'@emotion/react': ^11.10.4 '@emotion/react': ^11.10.4
'@emotion/server': ^11.10.0 '@emotion/server': ^11.10.0
'@emotion/styled': ^11.10.4 '@emotion/styled': ^11.10.4
'@fontsource/poppins': ^4.5.10
'@fontsource/space-mono': ^4.5.10 '@fontsource/space-mono': ^4.5.10
'@mui/base': ^5.0.0-alpha.87 '@mui/base': ^5.0.0-alpha.87
'@mui/icons-material': ^5.10.9 '@mui/icons-material': ^5.10.9
@@ -53,6 +54,7 @@ importers:
'@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34
'@emotion/server': 11.10.0_@emotion+css@11.10.0 '@emotion/server': 11.10.0_@emotion+css@11.10.0
'@emotion/styled': 11.10.4_yiaqs725o7pcd7rteavrnhgj4y '@emotion/styled': 11.10.4_yiaqs725o7pcd7rteavrnhgj4y
'@fontsource/poppins': 4.5.10
'@fontsource/space-mono': 4.5.10 '@fontsource/space-mono': 4.5.10
'@mui/base': 5.0.0-alpha.101_7ey2zzynotv32rpkwno45fsx4e '@mui/base': 5.0.0-alpha.101_7ey2zzynotv32rpkwno45fsx4e
'@mui/icons-material': 5.10.9_5fncb4nagb4cvvcnwamw2rozfa '@mui/icons-material': 5.10.9_5fncb4nagb4cvvcnwamw2rozfa
@@ -377,6 +379,10 @@ packages:
- supports-color - supports-color
dev: true dev: true
/@fontsource/poppins/4.5.10:
resolution: {integrity: sha512-oYZVHsnlwV3VWM1SE/m6SUxVh0QLk5+2wB+lBiXcI7N/0KVQWmV9YykaPqfJHBLvmdya+MAOnv+BQHeLU1vOOw==}
dev: false
/@fontsource/space-mono/4.5.10: /@fontsource/space-mono/4.5.10:
resolution: {integrity: sha512-OTrWNdcPp01bZjEbSu52vMu9PaReUFylHAMI4lctKVbYUnm+e7a4eG6YcnRvDrJEMYHBDtEWLAsqGVldV5r1EQ==} resolution: {integrity: sha512-OTrWNdcPp01bZjEbSu52vMu9PaReUFylHAMI4lctKVbYUnm+e7a4eG6YcnRvDrJEMYHBDtEWLAsqGVldV5r1EQ==}
dev: false dev: false
@@ -1432,7 +1438,7 @@ packages:
eslint-import-resolver-webpack: eslint-import-resolver-webpack:
optional: true optional: true
dependencies: dependencies:
'@typescript-eslint/parser': 5.38.0_eslint@8.22.0 '@typescript-eslint/parser': 5.38.0_76twfck5d7crjqrmw4yltga7zm
debug: 3.2.7 debug: 3.2.7
eslint: 8.22.0 eslint: 8.22.0
eslint-import-resolver-node: 0.3.6 eslint-import-resolver-node: 0.3.6
@@ -1451,7 +1457,7 @@ packages:
'@typescript-eslint/parser': '@typescript-eslint/parser':
optional: true optional: true
dependencies: dependencies:
'@typescript-eslint/parser': 5.38.0_eslint@8.22.0 '@typescript-eslint/parser': 5.38.0_76twfck5d7crjqrmw4yltga7zm
array-includes: 3.1.5 array-includes: 3.1.5
array.prototype.flat: 1.3.0 array.prototype.flat: 1.3.0
debug: 2.6.9 debug: 2.6.9