Skip to content

Commit eb31a43

Browse files
corcor
authored
fix: use new inter font (#1137)
2 parents 17fca7f + 888015a commit eb31a43

12 files changed

+60
-117
lines changed

‎site/astro.config.ts

-5
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ export default defineConfig({
100100
customCss: [
101101
"./src/styles/index.css",
102102
"./src/styles/tailwind.css",
103-
"@fontsource/inter/400.css",
104-
"@fontsource/inter/600.css",
105-
"@fontsource/inter/700.css",
106-
"@fontsource/inter/800.css",
107-
"@fontsource/inter/900.css",
108103
"@fontsource/ibm-plex-mono/400.css",
109104
"@fontsource/ibm-plex-mono/600.css",
110105
],

‎site/package-lock.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"dependencies": {
1717
"@astrojs/svelte": "^5.0.3",
1818
"@fontsource/ibm-plex-mono": "^5.0.8",
19-
"@fontsource/inter": "^5.0.16",
2019
"@fontsource/jetbrains-mono": "^5.0.18",
2120
"@urql/svelte": "^4.0.4",
2221
"graphql": "^16.8.1",

‎site/public/fonts/InterVariable-Italic.woff2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:0470791f15efd2987bdb50b24027c3f584a2cf9b7b63fbf86012c5f2e9abcc05
3+
size 380904

‎site/public/fonts/InterVariable.woff2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:8af7bd5b545567adffb3dfceb5bedb353a522d7bf1b3a2b8af7b6064156babc0
3+
size 345588

‎site/site.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
packages = {
88
site = pkgs.buildNpmPackage {
9-
npmDepsHash = "sha256-XV9Qj5kt7flySJRfbjTIqLqQp/thBGQzW5+udv80p6g=";
9+
npmDepsHash = "sha256-51tjuzgu99be504sAPQ+CsYpY6zYdgE9j5tRrnD9Iec=";
1010
src = ./.;
1111
pname = "site";
1212
version = "0.0.1";

‎site/src/content/blog/noble-and-movement-partnership.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Movement and Noble Partnership"
3-
date: 2024-01-24
3+
date: 2024-01-11
44
author: "union_build"
55
description: "Movement and Noble join forces with Union to transfer native assets across Celestia's modular stack"
66
hidden: false

‎site/src/layouts/layout.astro

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
---
2-
import '@fontsource/inter/500.css'
3-
import '@fontsource/inter/600.css'
4-
import '@fontsource/inter/700.css'
5-
import '@fontsource/inter/800.css'
6-
import '@fontsource/inter/900.css'
72
import '@fontsource/ibm-plex-mono'
83
import '@fontsource/jetbrains-mono'
94
import '#/styles/index.css'

‎site/src/pages/blog/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ blogEntries = blogEntries.sort((a, b) => (a.data.date > b.data.date ? -1 : 1))
1515
<main
1616
class='blog-post-container sm:text-xl px-4 sm:mt-0 mt-2 justify-center max-w-[45rem] self-center pb-40'
1717
>
18-
<ul class='list-none -ml-6 sm:ml-0'>
18+
<ul class='list-none'>
1919
{
2020
blogEntries.map(blogPostEntry => (
2121
<li class='mb-12'>

‎site/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ import Layout from '#/layouts/layout.astro'
9191
<style lang="postcss">
9292

9393
.main-text {
94-
max-width: 72rem;
94+
max-width: 72rem;
9595
font-size: 26px;
96-
font-weight: 900;
96+
font-weight: 900;
9797
text-align: center;
9898

9999
@media (min-width: 340px) {

‎site/src/styles/index.css

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@font-face {
2+
font-family: "Inter var";
3+
font-style: normal;
4+
font-weight: 100 900;
5+
font-display: swap;
6+
src: url("/fonts/InterVariable.woff2") format("woff2");
7+
}
8+
9+
@font-face {
10+
font-family: "Inter var";
11+
font-style: italic;
12+
font-weight: 100 900;
13+
font-display: swap;
14+
src: url("/fonts/InterVariable-Italic.woff2") format("woff2");
15+
}
16+
117
@font-face {
218
font-family: "Monospace Argon";
319
src: url("/fonts/MonaspaceArgon-Regular.woff") format("woff");
@@ -14,10 +30,6 @@
1430
font-display: swap;
1531
}
1632

17-
p {
18-
text-wrap: balance;
19-
}
20-
2133
p > a {
2234
color: #f9a8d4 !important;
2335
text-decoration: none;

‎site/tailwind.config.ts

+33-91
Original file line numberDiff line numberDiff line change
@@ -8,96 +8,6 @@ import starlightPlugin from "@astrojs/starlight-tailwind";
88
import aspectRatioPlugin from "@tailwindcss/aspect-ratio";
99
import containerQueriesPlugin from "@tailwindcss/container-queries";
1010

11-
const linkHeadingStyles = {
12-
color: colors.gray[100],
13-
borderBottomColor: "transparent",
14-
"&:hover": { color: `${colors.gray[900]}` },
15-
};
16-
17-
const extendTheme = {
18-
screens: {
19-
xs: "320px",
20-
},
21-
typography: ({
22-
theme,
23-
}: {
24-
theme: (
25-
path: string
26-
) => string | number | Record<string, unknown> | Array<unknown> | undefined;
27-
}) => ({
28-
DEFAULT: {
29-
css: {
30-
// h1: { fontFamily: theme('fontFamily.obviously') },
31-
pre: { background: "rgba(205, 200, 255, 0.05)" },
32-
"h2 a": linkHeadingStyles,
33-
"h3 a": linkHeadingStyles,
34-
"h4 a": linkHeadingStyles,
35-
"h5 a": linkHeadingStyles,
36-
"h6 a": linkHeadingStyles,
37-
blockquote: {
38-
fontSize: "90%",
39-
color: colors.zinc[500],
40-
borderLeftColor: colors.zinc[700],
41-
"p::before": { display: "none" },
42-
"p::after": { display: "none" },
43-
},
44-
a: {
45-
textDecoration: "none",
46-
borderBottom: `2px solid ${colors.cyan[800]}`,
47-
color: colors.cyan[400],
48-
transition:
49-
"color 0.2s ease, border-color 0.2s ease, background 0.2s ease",
50-
"&:hover": {
51-
color: `${colors.zinc[900]} !important`,
52-
borderBottomColor: `${colors.cyan[200]} !important`,
53-
background: colors.cyan[200],
54-
},
55-
},
56-
code: {
57-
color: "#86e1fc",
58-
"&::before": { content: `unset !important` },
59-
"&::after": { content: `unset !important` },
60-
fontWeight: "normal",
61-
},
62-
"[data-rehype-pretty-code-fragment]:nth-of-type(2) pre": {
63-
"[data-line]::before": {
64-
content: "counter(line)",
65-
counterIncrement: "line",
66-
display: "inline-block",
67-
width: "1rem",
68-
marginRight: "1rem",
69-
textAlign: "right",
70-
color: colors.slate[600],
71-
},
72-
"[data-highlighted-line]::before": { color: colors.slate[400] },
73-
},
74-
},
75-
},
76-
}),
77-
colors: {
78-
background: "#1b1b1d",
79-
bgDark: "#242526",
80-
sub: "#252525",
81-
primary: "#fff",
82-
accent: {
83-
"50": "#fdf2f8",
84-
"100": "#fce7f3",
85-
"200": "#ffc4e1",
86-
"300": "#f9a8d4",
87-
"400": "#FF87C3",
88-
"500": "#ec4899",
89-
"600": "#ff63c1",
90-
},
91-
gray: colors.zinc,
92-
},
93-
fontFamily: {
94-
mono: ['"IBM Plex Mono"', ...defaultTheme.fontFamily.mono],
95-
sans: ["Inter"],
96-
serif: ["Inter"],
97-
argon: ['"Monospace Argon"'],
98-
},
99-
};
100-
10111
export default {
10212
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
10313
darkMode: "class",
@@ -106,7 +16,39 @@ export default {
10616
theme: {
10717
transparent: "transparent",
10818
current: "currentColor",
109-
extend: extendTheme,
19+
extend: {
20+
screens: {
21+
xs: "320px",
22+
},
23+
colors: {
24+
background: "#1b1b1d",
25+
bgDark: "#242526",
26+
sub: "#252525",
27+
primary: "#fff",
28+
accent: {
29+
"50": "#fdf2f8",
30+
"100": "#fce7f3",
31+
"200": "#ffc4e1",
32+
"300": "#f9a8d4",
33+
"400": "#FF87C3",
34+
"500": "#ec4899",
35+
"600": "#ff63c1",
36+
},
37+
gray: colors.zinc,
38+
},
39+
fontFamily: {
40+
mono: ['"IBM Plex Mono"', ...defaultTheme.fontFamily.mono],
41+
sans: [
42+
'"Inter var", sans-serif',
43+
{
44+
fontFeatureSettings: '"cv11", "ss01"',
45+
fontVariationSettings: '"opsz" 32',
46+
},
47+
],
48+
serif: ['"Inter var"'],
49+
argon: ['"Monospace Argon"'],
50+
},
51+
},
11052
},
11153
plugins: [
11254
starlightPlugin(),

0 commit comments

Comments
 (0)