Skip to content

Commit 175c636

Browse files
rayraycodesrayraycodes
committed
next button erros fix
1 parent 4d83684 commit 175c636

3 files changed

Lines changed: 28 additions & 27 deletions

File tree

‎src/components/Navigation.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ export function Navigation({ inline = false }: NavigationProps) {
124124
? 'text-gray-900 font-semibold opacity-100 text-lg sm:text-xl'
125125
: 'text-gray-600 opacity-50 group-hover:text-gray-900 group-hover:opacity-100 text-sm sm:text-base'
126126
}`}
127+
style={{ fontFamily: "'Merriweather', Georgia, 'Times New Roman', serif", lineHeight: '1.54' }}
127128
>
128129
{link.label}
129130
</span>
@@ -279,6 +280,7 @@ export function Navigation({ inline = false }: NavigationProps) {
279280
? 'text-gray-900 font-semibold opacity-100 text-xl'
280281
: 'text-gray-600 opacity-50 group-hover:text-gray-900 group-hover:opacity-100 text-base'
281282
}`}
283+
style={{ fontFamily: "'Merriweather', Georgia, 'Times New Roman', serif", lineHeight: '1.54' }}
282284
>
283285
{link.label}
284286
</span>
@@ -326,6 +328,7 @@ export function Navigation({ inline = false }: NavigationProps) {
326328
? 'bg-gray-100/90 border border-gray-200/60 font-semibold text-gray-900 text-xl sm:text-2xl'
327329
: 'font-medium text-gray-600 opacity-50 active:opacity-100 active:bg-black/5 hover:opacity-100 hover:bg-black/[0.02] hover:text-gray-900 text-base sm:text-lg'
328330
}`}
331+
style={{ fontFamily: "'Merriweather', Georgia, 'Times New Roman', serif", lineHeight: '1.54' }}
329332
>
330333
{IconComponent && (
331334
<IconComponent className={`w-5 h-5 sm:w-6 sm:h-6 ${

‎src/index.css‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap");
2-
@import url("https://fonts.googleapis.com/css2?family=Merriweather:ital,wght@0,400;0,700;1,400;1,700&display=swap");
32
/*! tailwindcss v4.1.3 | MIT License | https://tailwindcss.com */
43
@layer properties {
54
@supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
@@ -165,8 +164,8 @@
165164
html, :host {
166165
-webkit-text-size-adjust: 100%;
167166
tab-size: 4;
168-
line-height: 1.54;
169-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
167+
line-height: 1.5;
168+
font-family: var(--default-font-family, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");
170169
font-feature-settings: var(--default-font-feature-settings, normal);
171170
font-variation-settings: var(--default-font-variation-settings, normal);
172171
-webkit-tap-highlight-color: transparent;
@@ -419,54 +418,54 @@
419418
color: var(--foreground);
420419
-webkit-font-smoothing: antialiased;
421420
-moz-osx-font-smoothing: grayscale;
422-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
421+
font-family: -apple-system, BlinkMacSystemFont, SF Pro Text, SF Pro Display, Inter, system-ui, sans-serif;
423422
}
424423

425424
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) h1 {
426425
font-size: var(--text-2xl);
427426
font-weight: var(--font-weight-medium);
428427
letter-spacing: -.02em;
429-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
430-
line-height: 1.54;
428+
font-family: -apple-system, BlinkMacSystemFont, SF Pro Display, Inter, system-ui, sans-serif;
429+
line-height: 1.5;
431430
}
432431

433432
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) h2 {
434433
font-size: var(--text-xl);
435434
font-weight: var(--font-weight-medium);
436435
letter-spacing: -.01em;
437-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
438-
line-height: 1.54;
436+
font-family: -apple-system, BlinkMacSystemFont, SF Pro Display, Inter, system-ui, sans-serif;
437+
line-height: 1.5;
439438
}
440439

441440
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) h3 {
442441
font-size: var(--text-lg);
443442
font-weight: var(--font-weight-medium);
444-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
445-
line-height: 1.54;
443+
font-family: -apple-system, BlinkMacSystemFont, SF Pro Display, Inter, system-ui, sans-serif;
444+
line-height: 1.5;
446445
}
447446

448447
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) h4 {
449448
font-size: var(--text-base);
450449
font-weight: var(--font-weight-medium);
451-
line-height: 1.54;
450+
line-height: 1.5;
452451
}
453452

454453
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) p {
455454
font-size: var(--text-base);
456455
font-weight: var(--font-weight-normal);
457-
line-height: 1.54;
456+
line-height: 1.5;
458457
}
459458

460459
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) label, :where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) button {
461460
font-size: var(--text-base);
462461
font-weight: var(--font-weight-medium);
463-
line-height: 1.54;
462+
line-height: 1.5;
464463
}
465464

466465
:where(:not(:has([class*=" text-"]), :not(:has([class^="text-"])))) input {
467466
font-size: var(--text-base);
468467
font-weight: var(--font-weight-normal);
469-
line-height: 1.54;
468+
line-height: 1.5;
470469
}
471470
}
472471

‎src/styles/globals.css‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@custom-variant dark (&:is(.dark *));
22

33
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
4-
@import url('https://fonts.googleapis.com/css2?family=Merriweather:ital,wght@0,400;0,700;1,400;1,700&display=swap');
54

65
:root {
76
--font-size: 16px;
@@ -131,7 +130,7 @@
131130

132131
body {
133132
@apply bg-background text-foreground;
134-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
133+
font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Text', 'SF Pro Display', 'Inter', system-ui, sans-serif;
135134
-webkit-font-smoothing: antialiased;
136135
-moz-osx-font-smoothing: grayscale;
137136
/* Smooth scrolling disabled to prevent double-scroll issue */
@@ -150,54 +149,54 @@
150149
h1 {
151150
font-size: var(--text-2xl);
152151
font-weight: var(--font-weight-medium);
153-
line-height: 1.54;
154-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
152+
line-height: 1.5;
153+
font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', 'Inter', system-ui, sans-serif;
155154
letter-spacing: -0.02em;
156155
}
157156

158157
h2 {
159158
font-size: var(--text-xl);
160159
font-weight: var(--font-weight-medium);
161-
line-height: 1.54;
162-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
160+
line-height: 1.5;
161+
font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', 'Inter', system-ui, sans-serif;
163162
letter-spacing: -0.01em;
164163
}
165164

166165
h3 {
167166
font-size: var(--text-lg);
168167
font-weight: var(--font-weight-medium);
169-
line-height: 1.54;
170-
font-family: 'Merriweather', Georgia, 'Times New Roman', serif;
168+
line-height: 1.5;
169+
font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', 'Inter', system-ui, sans-serif;
171170
}
172171

173172
h4 {
174173
font-size: var(--text-base);
175174
font-weight: var(--font-weight-medium);
176-
line-height: 1.54;
175+
line-height: 1.5;
177176
}
178177

179178
p {
180179
font-size: var(--text-base);
181180
font-weight: var(--font-weight-normal);
182-
line-height: 1.54;
181+
line-height: 1.5;
183182
}
184183

185184
label {
186185
font-size: var(--text-base);
187186
font-weight: var(--font-weight-medium);
188-
line-height: 1.54;
187+
line-height: 1.5;
189188
}
190189

191190
button {
192191
font-size: var(--text-base);
193192
font-weight: var(--font-weight-medium);
194-
line-height: 1.54;
193+
line-height: 1.5;
195194
}
196195

197196
input {
198197
font-size: var(--text-base);
199198
font-weight: var(--font-weight-normal);
200-
line-height: 1.54;
199+
line-height: 1.5;
201200
}
202201
}
203202
}

0 commit comments

Comments
 (0)