Skip to content

Commit ea2680d

Browse files
committed
update fonts
1 parent d1db14c commit ea2680d

23 files changed

+146
-103
lines changed

app/(navbar)/layout.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function Layout({ children }) {
77
<div className="mx-auto flex max-w-[90rem]">
88
<Sidebar />
99
<Navbar />
10-
<article className="w-full min-w-0 break-words min-h-[calc(100vh-var(--nextra-navbar-height))] text-slate-700 dark:text-slate-200 pb-8 px-6 pt-4 md:px-12">
10+
<article className="w-full min-w-0 break-words min-h-[calc(100vh-var(--nextra-navbar-height))] dark:text-slate-200 pb-8 px-6 pt-4 md:px-12">
1111
<main className="">{children}</main>
1212
</article>
1313
</div>

app/(private)/leaderboard/page.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ export default function Page() {
7777
<h3 className="font-semibold tracking-tight text-slate-900 dark:text-slate-100 mt-8 text-2xl">
7878
Sample 1
7979
</h3>
80-
<p className="mt-4 leading-7 first:mt-0">
80+
<p className="mt-4 first:mt-0">
8181
Sample data of Evaluation Result.
8282
</p>
8383
{/* <HighChart data={evaluationData} /> */}
8484
<h3 className="font-semibold tracking-tight text-slate-900 dark:text-slate-100 mt-8 text-2xl">
8585
Sample 2
8686
</h3>
87-
<p className="mt-4 leading-7 first:mt-0">
87+
<p className="mt-4 first:mt-0">
8888
Sample data of Evaluation Result.
8989
</p>
9090
{/* <PairwiseComparisonChart data={data} /> */}
9191
<h3 className="font-semibold tracking-tight text-slate-900 dark:text-slate-100 mt-8 text-2xl">
9292
Sample 3
9393
</h3>
94-
<p className="mt-4 leading-7 first:mt-0">
94+
<p className="mt-4 first:mt-0">
9595
Sample data of Evaluation Result.
9696
</p>
9797
{/* <HeatmapChart data={heatmapData} /> */}

app/(private)/result/page.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,21 @@ export default function Page() {
8080
<h3 className="font-semibold tracking-tight text-slate-900 dark:text-slate-100 mt-8 text-2xl">
8181
Sample 1
8282
</h3>
83-
<p className="mt-4 leading-7 first:mt-0">
83+
<p className="mt-4 first:mt-0">
8484
Sample data of Evaluation Result.
8585
</p>
8686
{/* <HighChart data={evaluationData} /> */}
8787
<h3 className="font-semibold tracking-tight text-slate-900 dark:text-slate-100 mt-8 text-2xl">
8888
Sample 2
8989
</h3>
90-
<p className="mt-4 leading-7 first:mt-0">
90+
<p className="mt-4 first:mt-0">
9191
Sample data of Evaluation Result.
9292
</p>
9393
{/* <PairwiseComparisonChart data={data} /> */}
9494
<h3 className="font-semibold tracking-tight text-slate-900 dark:text-slate-100 mt-8 text-2xl">
9595
Sample 3
9696
</h3>
97-
<p className="mt-4 leading-7 first:mt-0">
97+
<p className="mt-4 first:mt-0">
9898
Sample data of Evaluation Result.
9999
</p>
100100
{/* <HeatmapChart data={heatmapData} /> */}

app/fonts.css

Lines changed: 26 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,45 @@
1-
/* KaTeX Main Font Family */
21
@font-face {
3-
font-family: "KaTeX_Main";
4-
font-style: normal;
5-
font-weight: 400;
6-
src:
7-
local("KaTeX_Main-Regular"),
8-
url("/mathfonts/KaTeX_Main-Regular.woff2") format("woff2"),
9-
url("/mathfonts/KaTeX_Main-Regular.woff") format("woff"),
10-
url("/mathfonts/KaTeX_Main-Regular.ttf") format("truetype");
11-
}
12-
13-
@font-face {
14-
font-family: "KaTeX_Main";
15-
font-style: italic;
16-
font-weight: 400;
2+
font-family: "SurveyWithCode";
173
src:
18-
local("KaTeX_Main-Italic"),
19-
url("/mathfonts/KaTeX_Main-Italic.woff2") format("woff2"),
20-
url("/mathfonts/KaTeX_Main-Italic.woff") format("woff"),
21-
url("/mathfonts/KaTeX_Main-Italic.ttf") format("truetype");
22-
}
23-
24-
@font-face {
25-
font-family: "KaTeX_Main";
4+
url("/serif/SurveyWithCode-Bold.woff2") format("woff2"),
5+
url("/serif/SurveyWithCode-Bold.woff") format("woff"),
6+
url("/serif/SurveyWithCode-Bold.ttf") format("truetype");
7+
font-weight: bold;
268
font-style: normal;
27-
font-weight: 700;
28-
src:
29-
local("KaTeX_Main-Bold"),
30-
url("/mathfonts/KaTeX_Main-Bold.woff2") format("woff2"),
31-
url("/mathfonts/KaTeX_Main-Bold.woff") format("woff"),
32-
url("/mathfonts/KaTeX_Main-Bold.ttf") format("truetype");
33-
}
34-
35-
@font-face {
36-
font-family: "KaTeX_Main";
37-
font-style: italic;
38-
font-weight: 700;
39-
src:
40-
local("KaTeX_Main-BoldItalic"),
41-
url("/mathfonts/KaTeX_Main-BoldItalic.woff2") format("woff2"),
42-
url("/mathfonts/KaTeX_Main-BoldItalic.woff") format("woff"),
43-
url("/mathfonts/KaTeX_Main-BoldItalic.ttf") format("truetype");
9+
font-display: swap;
4410
}
4511

46-
/* KaTeX Sans Serif Font Family */
4712
@font-face {
48-
font-family: "KaTeX_SansSerif";
49-
font-style: normal;
50-
font-weight: 400;
13+
font-family: "SurveyWithCode";
5114
src:
52-
local("KaTeX_SansSerif-Regular"),
53-
url("/mathfonts/KaTeX_SansSerif-Regular.woff2") format("woff2"),
54-
url("/mathfonts/KaTeX_SansSerif-Regular.woff") format("woff"),
55-
url("/mathfonts/KaTeX_SansSerif-Regular.ttf") format("truetype");
56-
}
57-
58-
@font-face {
59-
font-family: "KaTeX_SansSerif";
15+
url("/serif/SurveyWithCode-BoldItalic.woff2") format("woff2"),
16+
url("/serif/SurveyWithCode-BoldItalic.woff") format("woff"),
17+
url("/serif/SurveyWithCode-BoldItalic.ttf") format("truetype");
18+
font-weight: bold;
6019
font-style: italic;
61-
font-weight: 400;
62-
src:
63-
local("KaTeX_SansSerif-Italic"),
64-
url("/mathfonts/KaTeX_SansSerif-Italic.woff2") format("woff2"),
65-
url("/mathfonts/KaTeX_SansSerif-Italic.woff") format("woff"),
66-
url("/mathfonts/KaTeX_SansSerif-Italic.ttf") format("truetype");
20+
font-display: swap;
6721
}
6822

6923
@font-face {
70-
font-family: "KaTeX_SansSerif";
71-
font-style: normal;
72-
font-weight: 700;
24+
font-family: "SurveyWithCode";
7325
src:
74-
local("KaTeX_SansSerif-Bold"),
75-
url("/mathfonts/KaTeX_SansSerif-Bold.woff2") format("woff2"),
76-
url("/mathfonts/KaTeX_SansSerif-Bold.woff") format("woff"),
77-
url("/mathfonts/KaTeX_SansSerif-Bold.ttf") format("truetype");
26+
url("/serif/SurveyWithCode-Regular.woff2") format("woff2"),
27+
url("/serif/SurveyWithCode-Regular.woff") format("woff"),
28+
url("/serif/SurveyWithCode-Regular.ttf") format("truetype");
29+
font-weight: 500;
30+
font-style: normal;
31+
font-display: swap;
7832
}
7933

80-
/* KaTeX Typewriter Font Family */
8134
@font-face {
82-
font-family: "KaTeX_Typewriter";
83-
font-style: normal;
84-
font-weight: 400;
35+
font-family: "SurveyWithCode";
8536
src:
86-
local("KaTeX_Typewriter-Regular"),
87-
url("/mathfonts/KaTeX_Typewriter-Regular.woff2") format("woff2"),
88-
url("/mathfonts/KaTeX_Typewriter-Regular.woff") format("woff"),
89-
url("/mathfonts/KaTeX_Typewriter-Regular.ttf") format("truetype");
37+
url("/serif/SurveyWithCode-Italic.woff2") format("woff2"),
38+
url("/serif/SurveyWithCode-Italic.woff") format("woff"),
39+
url("/serif/SurveyWithCode-Italic.ttf") format("truetype");
40+
font-weight: 500;
41+
font-style: italic;
42+
font-display: swap;
9043
}
9144

9245
/* Keep TTT fonts as fallback */

app/globals.css

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import "tailwindcss";
22

33
@import "./fonts.css";
4+
@import "./mathfonts.css";
45
@import "./colors.css";
56

67
@import "../styles/cards.css";
@@ -17,8 +18,6 @@
1718
@custom-variant dark (&:where(.dark, .dark *));
1819
@custom-variant light (&:where(.light, .light *));
1920

20-
21-
2221
@layer base {
2322
:root {
2423
--nextra-primary-hue: 212deg;
@@ -46,13 +45,17 @@
4645
}
4746

4847
html {
49-
font-feature-settings:
50-
"rlig" 1,
51-
"calt" 1,
52-
"ss01" 1,
53-
"ss06" 1 !important;
48+
font-size: 13.333px;
49+
font-feature-settings: "liga", "kern";
50+
font-variant-ligatures: common-ligatures discretionary-ligatures;
51+
font-kerning: normal;
52+
font-variant-numeric: oldstyle-nums;
53+
line-height: 1.2;
54+
letter-spacing: 0;
55+
word-spacing: 0;
56+
/* font-feature-settings: "rlig" 1, "calt" 1, "ss01" 1, "ss06" 1; */
5457
font-family:
55-
"KaTeX_Main",
58+
"SurveyWithCode",
5659
"Segoe UI",
5760
TTT,
5861
ui-sans-serif,
@@ -70,24 +73,16 @@
7073
Segoe UI Emoji,
7174
Segoe UI Symbol,
7275
Noto Color Emoji;
73-
}
7476

75-
html {
7677
scroll-padding-top: 4rem;
7778
-webkit-font-smoothing: antialiased;
7879
-moz-osx-font-smoothing: grayscale;
79-
font-feature-settings:
80-
"rlig" 1,
81-
"calt" 1,
82-
"ss01" 1;
83-
-webkit-tap-highlight-color: transparent;
80+
/* font-feature-settings: "rlig" 1, "calt" 1, "ss01" 1; */
81+
8482
font-size: 1rem;
85-
}
8683

87-
html {
8884
tab-size: 4;
89-
font-feature-settings: normal;
90-
font-variation-settings: normal;
85+
/* font-feature-settings: normal; */
9186
}
9287
}
9388

app/layout.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ export default async function RootLayout({ children }) {
4545
<link rel="apple-touch-icon" href="/apple-touch-icon.png"></link>
4646
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"></link>
4747
<link rel="manifest" href="/site.webmanifest"></link>
48+
49+
<link rel="preload" href="/serif/SurveyWithCode-Bold.woff2" as="font" type="font/woff2" crossorigin></link>
50+
<link rel="preload" href="/serif/SurveyWithCode-BoldItalic.woff2" as="font" type="font/woff2" crossorigin></link>
51+
<link rel="preload" href="/serif/SurveyWithCode-Regular.woff2" as="font" type="font/woff2" crossorigin></link>
52+
<link rel="preload" href="/serif/SurveyWithCode-Italic.woff2" as="font" type="font/woff2" crossorigin></link>
4853
</head>
4954
<body className="nextra-banner-hidden">
5055
<ErrorBoundary>

app/mathfonts.css

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/* KaTeX Main Font Family */
2+
@font-face {
3+
font-family: "KaTeX_Main";
4+
font-style: normal;
5+
font-weight: 400;
6+
src:
7+
local("KaTeX_Main-Regular"),
8+
url("/mathfonts/KaTeX_Main-Regular.woff2") format("woff2"),
9+
url("/mathfonts/KaTeX_Main-Regular.woff") format("woff"),
10+
url("/mathfonts/KaTeX_Main-Regular.ttf") format("truetype");
11+
}
12+
13+
@font-face {
14+
font-family: "KaTeX_Main";
15+
font-style: italic;
16+
font-weight: 400;
17+
src:
18+
local("KaTeX_Main-Italic"),
19+
url("/mathfonts/KaTeX_Main-Italic.woff2") format("woff2"),
20+
url("/mathfonts/KaTeX_Main-Italic.woff") format("woff"),
21+
url("/mathfonts/KaTeX_Main-Italic.ttf") format("truetype");
22+
}
23+
24+
@font-face {
25+
font-family: "KaTeX_Main";
26+
font-style: normal;
27+
font-weight: 700;
28+
src:
29+
local("KaTeX_Main-Bold"),
30+
url("/mathfonts/KaTeX_Main-Bold.woff2") format("woff2"),
31+
url("/mathfonts/KaTeX_Main-Bold.woff") format("woff"),
32+
url("/mathfonts/KaTeX_Main-Bold.ttf") format("truetype");
33+
}
34+
35+
@font-face {
36+
font-family: "KaTeX_Main";
37+
font-style: italic;
38+
font-weight: 700;
39+
src:
40+
local("KaTeX_Main-BoldItalic"),
41+
url("/mathfonts/KaTeX_Main-BoldItalic.woff2") format("woff2"),
42+
url("/mathfonts/KaTeX_Main-BoldItalic.woff") format("woff"),
43+
url("/mathfonts/KaTeX_Main-BoldItalic.ttf") format("truetype");
44+
}
45+
46+
/* KaTeX Sans Serif Font Family */
47+
@font-face {
48+
font-family: "KaTeX_SansSerif";
49+
font-style: normal;
50+
font-weight: 400;
51+
src:
52+
local("KaTeX_SansSerif-Regular"),
53+
url("/mathfonts/KaTeX_SansSerif-Regular.woff2") format("woff2"),
54+
url("/mathfonts/KaTeX_SansSerif-Regular.woff") format("woff"),
55+
url("/mathfonts/KaTeX_SansSerif-Regular.ttf") format("truetype");
56+
}
57+
58+
@font-face {
59+
font-family: "KaTeX_SansSerif";
60+
font-style: italic;
61+
font-weight: 400;
62+
src:
63+
local("KaTeX_SansSerif-Italic"),
64+
url("/mathfonts/KaTeX_SansSerif-Italic.woff2") format("woff2"),
65+
url("/mathfonts/KaTeX_SansSerif-Italic.woff") format("woff"),
66+
url("/mathfonts/KaTeX_SansSerif-Italic.ttf") format("truetype");
67+
}
68+
69+
@font-face {
70+
font-family: "KaTeX_SansSerif";
71+
font-style: normal;
72+
font-weight: 700;
73+
src:
74+
local("KaTeX_SansSerif-Bold"),
75+
url("/mathfonts/KaTeX_SansSerif-Bold.woff2") format("woff2"),
76+
url("/mathfonts/KaTeX_SansSerif-Bold.woff") format("woff"),
77+
url("/mathfonts/KaTeX_SansSerif-Bold.ttf") format("truetype");
78+
}
79+
80+
/* KaTeX Typewriter Font Family */
81+
@font-face {
82+
font-family: "KaTeX_Typewriter";
83+
font-style: normal;
84+
font-weight: 400;
85+
src:
86+
local("KaTeX_Typewriter-Regular"),
87+
url("/mathfonts/KaTeX_Typewriter-Regular.woff2") format("woff2"),
88+
url("/mathfonts/KaTeX_Typewriter-Regular.woff") format("woff"),
89+
url("/mathfonts/KaTeX_Typewriter-Regular.ttf") format("truetype");
90+
}

mdx-components.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export function useMDXComponents(components) {
104104
table: (props) => (
105105
<Table className="nextra-scrollbar mt-4 p-0 first:mt-0" {...props} />
106106
),
107-
p: (props) => <p className="mt-4 leading-7 first:mt-0" {...props} />,
107+
p: (props) => <p className="mt-4 first:mt-0" {...props} />,
108108
tr: Tr,
109109
th: Th,
110110
td: Td,

nextra/callout.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export function Callout({
5050
>
5151
{emoji}
5252
</div>
53-
<div className="w-full min-w-0 leading-7">{children}</div>
53+
<div className="w-full min-w-0">{children}</div>
5454
</div>
5555
)
5656
}
216 KB
Binary file not shown.

0 commit comments

Comments
 (0)