xfy/DefectingCat.github.io
1
0
Fork 0
mirror of https://github.com/DefectingCat/DefectingCat.github.io synced 2025-07-15 16:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fonts issue

Browse Source
This commit is contained in:
DefectingCat
2023-05-16 15:50:48 +08:00
parent 5352b56a03
commit cb351db3d6
6 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/nav-bar.tsx
View File

@ -83,7 +83,7 @@ const HeadBar = () => {
<Link href="/"> <Link href="/">
<span <span
className={clsx( className={clsx(
'font-semibold font-Aref-Ruqaa', 'font-semibold',
'text-3xl tracking-widest', 'text-3xl tracking-widest',
'select-none' 'select-none'
)} )}
@ -161,4 +161,4 @@ const HeadBar = () => {
); );
}; };
export default memo(HeadBar); export default memo(HeadBar);

18
lib/fonts.ts
View File

@ -1,10 +1,4 @@
import { import { Aleo, Barlow, JetBrains_Mono, Poppins } from 'next/font/google';
Aleo,
Aref_Ruqaa,
Barlow,
JetBrains_Mono,
Poppins,
} from 'next/font/google';
export const aleo = Aleo({ export const aleo = Aleo({
weight: ['300', '400', '700'], weight: ['300', '400', '700'],
@ -13,13 +7,6 @@ export const aleo = Aleo({
subsets: ['latin'], subsets: ['latin'],
}); });
export const aref_ruqaa = Aref_Ruqaa({
weight: ['400', '700'],
variable: '--font-aref-ruqaa',
display: 'swap',
subsets: ['latin'],
});
export const barlow = Barlow({ export const barlow = Barlow({
weight: ['100', '200', '300', '400', '500', '600', '700', '800', '900'], weight: ['100', '200', '300', '400', '500', '600', '700', '800', '900'],
variable: '--font-barlow', variable: '--font-barlow',
@ -29,7 +16,7 @@ export const barlow = Barlow({
export const jetbrains_mono = JetBrains_Mono({ export const jetbrains_mono = JetBrains_Mono({
display: 'swap', display: 'swap',
weight: ['300', '400', '700'], weight: ['200', '300', '400', '700'],
variable: '--font-jetbrains-mono', variable: '--font-jetbrains-mono',
subsets: ['latin'], subsets: ['latin'],
}); });
@ -42,7 +29,6 @@ export const poppins = Poppins({
const fonts = { const fonts = {
aleo, aleo,
aref_ruqaa,
barlow, barlow,
jetbrains_mono, jetbrains_mono,
poppins, poppins,

4
styles/prism-one-dark.css
View File

@ -35,7 +35,7 @@
text-shadow: 0 1px rgba(0, 0, 0, 0.3); text-shadow: 0 1px rgba(0, 0, 0, 0.3);
/* font-family: 'Fira Code', 'Fira Mono', Menlo, Consolas, 'DejaVu Sans Mono', /* font-family: 'Fira Code', 'Fira Mono', Menlo, Consolas, 'DejaVu Sans Mono',
monospace; */ monospace; */
font-family: 'JetBrains Mono', -apple-system, 'DejaVu Sans Mono', monospace; font-family: var(--font-jetbrains-mono), -apple-system, 'DejaVu Sans Mono', monospace;
direction: ltr; direction: ltr;
text-align: left; text-align: left;
white-space: pre; white-space: pre;
@ -520,4 +520,4 @@ pre
/* Fill colour of the handle */ /* Fill colour of the handle */
.dark .prism-previewer-easing.prism-previewer-easing circle { .dark .prism-previewer-easing.prism-previewer-easing circle {
fill: transparent; fill: transparent;
} }

5
styles/prism-one-light.css
View File

@ -34,7 +34,8 @@ pre {
color: hsl(230, 8%, 24%); color: hsl(230, 8%, 24%);
/* font-family: 'Fira Code', 'Fira Mono', Menlo, Consolas, 'DejaVu Sans Mono', /* font-family: 'Fira Code', 'Fira Mono', Menlo, Consolas, 'DejaVu Sans Mono',
monospace; */ monospace; */
font-family: 'JetBrains Mono', -apple-system, 'DejaVu Sans Mono', monospace; font-family: var(--font-jetbrains-mono), -apple-system, 'DejaVu Sans Mono',
monospace;
direction: ltr; direction: ltr;
text-align: left; text-align: left;
white-space: pre; white-space: pre;
@ -432,4 +433,4 @@ pre > code.diff-highlight .token.token.inserted:not(.prefix) *::selection {
/* Fill colour of the handle */ /* Fill colour of the handle */
.prism-previewer-easing.prism-previewer-easing circle { .prism-previewer-easing.prism-previewer-easing circle {
fill: transparent; fill: transparent;
} }

4
styles/rua.css
View File

@ -371,5 +371,5 @@ h6:hover::before {
#article .cm-editor .cm-line { #article .cm-editor .cm-line {
font-size: 15px; font-size: 15px;
font-family: 'JetBrains Mono', -apple-system, monospace; font-family: var(--font-jetbrains-mono), -apple-system, monospace;
} }

10
tailwind.config.js
View File

@ -10,10 +10,14 @@ module.exports = {
extend: { extend: {
fontFamily: { fontFamily: {
Aleo: ['--font-aleo'], Aleo: ['--font-aleo'],
'Aref-Ruqaa': ['var(--font-aref-ruqaa)'],
Barlow: ['var(--font-barlow)'], Barlow: ['var(--font-barlow)'],
Poppins: ['var(--font-poppins)'], Poppins: ['var(--font-poppins)'],
Mono: ['var(--fonts-jetbrains-mono)', '-apple-system', 'monospace'], Mono: [
'var(--fonts-jetbrains-mono)',
'DejaVu Sans Mono',
'-apple-system',
'monospace',
],
}, },
colors: { colors: {
bluish: { bluish: {
@ -41,4 +45,4 @@ module.exports = {
}, },
}, },
plugins: [], plugins: [],
}; };