Skip to content

Commit 735b00f

Browse files
navn-rnavn-r
committed
fix: update format + linting
1 parent aff88e6 commit 735b00f

File tree

8 files changed

+67
-41
lines changed

8 files changed

+67
-41
lines changed

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 16
21+
node-version: 18
2222
- uses: pnpm/action-setup@v2
2323
with:
2424
version: 8.4.0

‎.prettierrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ tabWidth: 2
44
singleQuote: true
55
bracketSpacing: true
66
arrowParens: "always"
7-
plugins: ["./node_modules/prettier-plugin-svelte"]
7+
plugins: ["prettier-plugin-svelte"]

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"url": "https://github.com/navn-r/navn-r.github.io/issues"
1515
},
1616
"engines": {
17-
"node": ">=12.x"
17+
"node": ">=18.x"
1818
},
1919
"scripts": {
2020
"dev": "vite --host",
2121
"build": "vite build",
2222
"serve": "vite preview",
23-
"lint": "svelte-check --tsconfig tsconfig.json --fail-on-warnings --fail-on-hints",
23+
"lint": "svelte-check --tsconfig tsconfig.json --fail-on-warnings",
2424
"format": "prettier --write src",
2525
"prepare": "husky install",
2626
"precommit": "lint-staged"

‎public/cartographer.svg

Lines changed: 1 addition & 9 deletions
Loading

‎src/components/Cursor.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@
7070
width: 10px;
7171
height: 10px;
7272
background: #ffffff;
73-
transition: width 0.3s, height 0.3s;
73+
transition:
74+
width 0.3s,
75+
height 0.3s;
7476
}
7577
7678
.outer {

‎src/components/Voice.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
background: none;
4545
border: none;
4646
}
47-
4847
4948
i {
5049
font-size: 1.25rem;

‎src/styles/_fonts.scss

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
font-weight: 700;
1616
font-style: normal;
1717
font-display: swap;
18-
src: local('Apple Garamond'),
18+
src:
19+
local('Apple Garamond'),
1920
url('/src/assets/fonts/applegaramond/bold.woff2') format('woff2');
2021
}
2122

@@ -24,7 +25,8 @@
2425
font-weight: normal;
2526
font-style: italic;
2627
font-display: swap;
27-
src: local('Apple Garamond'),
28+
src:
29+
local('Apple Garamond'),
2830
url('/src/assets/fonts/applegaramond/italic.woff2') format('woff2');
2931
}
3032

@@ -33,7 +35,8 @@
3335
font-weight: 400;
3436
font-style: normal;
3537
font-display: swap;
36-
src: local('Apple Garamond'),
38+
src:
39+
local('Apple Garamond'),
3740
url('/src/assets/fonts/applegaramond/regular.woff2') format('woff2');
3841
}
3942

@@ -42,7 +45,8 @@
4245
font-weight: 700;
4346
font-style: italic;
4447
font-display: swap;
45-
src: local('Apple Garamond'),
48+
src:
49+
local('Apple Garamond'),
4650
url('/src/assets/fonts/applegaramond/bold-italic.woff2') format('woff2');
4751
}
4852

@@ -51,7 +55,8 @@
5155
font-weight: 200;
5256
font-style: normal;
5357
font-display: swap;
54-
src: local('Apple Garamond'),
58+
src:
59+
local('Apple Garamond'),
5560
url('/src/assets/fonts/applegaramond/light.woff2') format('woff2');
5661
}
5762

@@ -60,7 +65,8 @@
6065
font-weight: 200;
6166
font-style: italic;
6267
font-display: swap;
63-
src: local('Apple Garamond'),
68+
src:
69+
local('Apple Garamond'),
6470
url('/src/assets/fonts/applegaramond/light-italic.woff2') format('woff2');
6571
}
6672

@@ -69,7 +75,8 @@
6975
font-weight: 950;
7076
font-style: normal;
7177
font-display: swap;
72-
src: local('SF Pro Display'),
78+
src:
79+
local('SF Pro Display'),
7380
url('/src/assets/fonts/sfpro/Display-Black.woff2') format('woff2');
7481
}
7582

@@ -78,7 +85,8 @@
7885
font-weight: 950;
7986
font-style: italic;
8087
font-display: swap;
81-
src: local('SF Pro Display'),
88+
src:
89+
local('SF Pro Display'),
8290
url('/src/assets/fonts/sfpro/Display-BlackItalic.woff2') format('woff2');
8391
}
8492

@@ -87,7 +95,8 @@
8795
font-weight: 700;
8896
font-style: normal;
8997
font-display: swap;
90-
src: local('SF Pro Display'),
98+
src:
99+
local('SF Pro Display'),
91100
url('/src/assets/fonts/sfpro/Display-Bold.woff2') format('woff2');
92101
}
93102

@@ -96,7 +105,8 @@
96105
font-weight: 700;
97106
font-style: italic;
98107
font-display: swap;
99-
src: local('SF Pro Display'),
108+
src:
109+
local('SF Pro Display'),
100110
url('/src/assets/fonts/sfpro/Display-BoldItalic.woff2') format('woff2');
101111
}
102112

@@ -105,7 +115,8 @@
105115
font-weight: 900;
106116
font-style: normal;
107117
font-display: swap;
108-
src: local('SF Pro Display'),
118+
src:
119+
local('SF Pro Display'),
109120
url('/src/assets/fonts/sfpro/Display-Heavy.woff2') format('woff2');
110121
}
111122

@@ -114,7 +125,8 @@
114125
font-weight: 900;
115126
font-style: italic;
116127
font-display: swap;
117-
src: local('SF Pro Display'),
128+
src:
129+
local('SF Pro Display'),
118130
url('/src/assets/fonts/sfpro/Display-HeavyItalic.woff2') format('woff2');
119131
}
120132

@@ -123,7 +135,8 @@
123135
font-weight: 300;
124136
font-style: normal;
125137
font-display: swap;
126-
src: local('SF Pro Display'),
138+
src:
139+
local('SF Pro Display'),
127140
url('/src/assets/fonts/sfpro/Display-Light.woff2') format('woff2');
128141
}
129142

@@ -132,7 +145,8 @@
132145
font-weight: 300;
133146
font-style: italic;
134147
font-display: swap;
135-
src: local('SF Pro Display'),
148+
src:
149+
local('SF Pro Display'),
136150
url('/src/assets/fonts/sfpro/Display-LightItalic.woff2') format('woff2');
137151
}
138152

@@ -141,7 +155,8 @@
141155
font-weight: 500;
142156
font-style: normal;
143157
font-display: swap;
144-
src: local('SF Pro Display'),
158+
src:
159+
local('SF Pro Display'),
145160
url('/src/assets/fonts/sfpro/Display-Medium.woff2') format('woff2');
146161
}
147162

@@ -150,7 +165,8 @@
150165
font-weight: 500;
151166
font-style: italic;
152167
font-display: swap;
153-
src: local('SF Pro Display'),
168+
src:
169+
local('SF Pro Display'),
154170
url('/src/assets/fonts/sfpro/Display-MediumItalic.woff2') format('woff2');
155171
}
156172

@@ -159,7 +175,8 @@
159175
font-weight: 400;
160176
font-style: normal;
161177
font-display: swap;
162-
src: local('SF Pro Display'),
178+
src:
179+
local('SF Pro Display'),
163180
url('/src/assets/fonts/sfpro/Display-Regular.woff2') format('woff2');
164181
}
165182

@@ -168,7 +185,8 @@
168185
font-weight: 400;
169186
font-style: italic;
170187
font-display: swap;
171-
src: local('SF Pro Display'),
188+
src:
189+
local('SF Pro Display'),
172190
url('/src/assets/fonts/sfpro/Display-RegularItalic.woff2') format('woff2');
173191
}
174192

@@ -177,7 +195,8 @@
177195
font-weight: 600;
178196
font-style: normal;
179197
font-display: swap;
180-
src: local('SF Pro Display'),
198+
src:
199+
local('SF Pro Display'),
181200
url('/src/assets/fonts/sfpro/Display-Semibold.woff2') format('woff2');
182201
}
183202

@@ -186,7 +205,8 @@
186205
font-weight: 600;
187206
font-style: italic;
188207
font-display: swap;
189-
src: local('SF Pro Display'),
208+
src:
209+
local('SF Pro Display'),
190210
url('/src/assets/fonts/sfpro/Display-SemiboldItalic.woff2') format('woff2');
191211
}
192212

@@ -195,7 +215,8 @@
195215
font-weight: 100;
196216
font-style: normal;
197217
font-display: swap;
198-
src: local('SF Pro Display'),
218+
src:
219+
local('SF Pro Display'),
199220
url('/src/assets/fonts/sfpro/Display-Thin.woff2') format('woff2');
200221
}
201222

@@ -204,7 +225,8 @@
204225
font-weight: 100;
205226
font-style: italic;
206227
font-display: swap;
207-
src: local('SF Pro Display'),
228+
src:
229+
local('SF Pro Display'),
208230
url('/src/assets/fonts/sfpro/Display-ThinItalic.woff2') format('woff2');
209231
}
210232

@@ -213,7 +235,8 @@
213235
font-weight: 50;
214236
font-style: normal;
215237
font-display: swap;
216-
src: local('SF Pro Display'),
238+
src:
239+
local('SF Pro Display'),
217240
url('/src/assets/fonts/sfpro/Display-Ultralight.woff2') format('woff2');
218241
}
219242

@@ -222,7 +245,8 @@
222245
font-weight: 50;
223246
font-style: italic;
224247
font-display: swap;
225-
src: local('SF Pro Display'),
248+
src:
249+
local('SF Pro Display'),
226250
url('/src/assets/fonts/sfpro/Display-UltralightItalic.woff2')
227251
format('woff2');
228252
}

‎src/styles/_variables.scss

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,17 @@ $serif: 'Apple Garamond', Garamond, 'ITC Garamond Narrow', 'Palatino Linotype',
1212
'New Century Schoolbook', 'Century Schoolbook', 'Century Schoolbook L',
1313
Georgia, serif;
1414

15-
$sans-serif: 'SF Pro Display', -apple-system, BlinkMacSystemFont, 'Segoe UI',
16-
Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
15+
$sans-serif:
16+
'SF Pro Display',
17+
-apple-system,
18+
BlinkMacSystemFont,
19+
'Segoe UI',
20+
Roboto,
21+
Helvetica,
22+
Arial,
23+
sans-serif,
24+
'Apple Color Emoji',
25+
'Segoe UI Emoji',
1726
'Segoe UI Symbol';
1827

1928
$funky: 'Lostar', $serif;

0 commit comments

Comments
 (0)