Skip to content

Commit 1db1093

Browse files
committed
Squashed commit of the following:
commit abff5e2 Author: Tanner Linsley <[email protected]> Date: Tue Aug 12 19:07:36 2025 -0600 more conflict resolution commit 006fd8c Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 17:32:31 2025 +0200 fix: revert splash afphoto commit 288476c Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 17:30:43 2025 +0200 fix: small menu height commit 931f4d5 Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 17:01:32 2025 +0200 cleanup commit fb3e69d Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 15:57:49 2025 +0200 feat: migrate tailwind config commit abd4027 Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 15:15:39 2025 +0200 feat: update spacings commit ffa0128 Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 13:48:35 2025 +0200 feat: update colors commit 6af1d56 Author: Leonardo Montini <[email protected]> Date: Fri Aug 8 11:58:11 2025 +0200 feat: tailwind migration tool
1 parent bbd27a6 commit 1db1093

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+546
-4672
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ node_modules
22
package-lock.json
33
yarn.lock
44

5+
.tanstack
56
.DS_Store
67
.cache
78
.env

media/splash/splash-dark.afphoto

3.36 MB
Binary file not shown.

media/splash/splash-light.afphoto

3.02 MB
Binary file not shown.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"@sentry/react": "^8.35.0",
3434
"@sentry/vite-plugin": "^2.22.6",
3535
"@tailwindcss/typography": "^0.5.13",
36+
"@tailwindcss/vite": "^4.1.11",
3637
"@tanstack/react-pacer": "^0.7.0",
3738
"@tanstack/react-query": "^5.84.2",
3839
"@tanstack/react-router": "1.131.2",
@@ -92,7 +93,7 @@
9293
"npm-run-all": "^4.1.5",
9394
"postcss": "^8.4.35",
9495
"prettier": "^2.8.8",
95-
"tailwindcss": "^3.4.1",
96+
"tailwindcss": "^4.1.11",
9697
"typescript": "^5.6.3",
9798
"vite": "^6.3.5"
9899
},

pnpm-lock.yaml

Lines changed: 342 additions & 304 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postcss.config.cjs

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/components/Doc.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export function Doc({
121121
<div
122122
className={twMerge(
123123
'flex overflow-auto flex-col w-full p-4 lg:p-6',
124-
isTocVisible && '!pr-0'
124+
isTocVisible && 'pr-0!'
125125
)}
126126
>
127127
<AdGate>
@@ -133,7 +133,7 @@ export function Doc({
133133
{setIsFullWidth && (
134134
<button
135135
onClick={() => setIsFullWidth(!isFullWidth)}
136-
className="p-2 mr-4 text-gray-600 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors flex-shrink-0 hidden [@media(min-width:1800px)]:inline-flex"
136+
className="p-2 mr-4 text-gray-600 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors shrink-0 hidden [@media(min-width:1800px)]:inline-flex"
137137
title={isFullWidth ? 'Constrain width' : 'Expand width'}
138138
>
139139
{isFullWidth ? (

src/components/DocsLayout.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -393,16 +393,16 @@ export function DocsLayout({
393393
return (
394394
<WrapperComp
395395
key={`group-${i}`}
396-
className="[&>summary]:before:mr-[0.4rem] [&>summary]:marker:text-[0.8em] [&>summary]:marker:-ml-[0.3rem] [&>summary]:marker:leading-4 [&>div.ts-sidebar-label]:ml-[1rem] relative select-none"
396+
className="[&>summary]:before:mr-[0.4rem] [&>summary]:marker:text-[0.8em] [&>summary]:marker:-ml-[0.3rem] [&>summary]:marker:leading-4 [&>div.ts-sidebar-label]:ml-4 relative select-none"
397397
{...detailsProps}
398398
>
399399
<LabelComp className="text-[.8em] uppercase font-black leading-4 ts-sidebar-label">
400400
{group?.label}
401401
</LabelComp>
402402
<div className="h-2" />
403-
<ul className="ml-2 text-[.85em] list-none">
403+
<ul className="ml-2 text-[.85em] leading-6 list-none">
404404
{group?.children?.map((child, i) => {
405-
const linkClasses = `cursor-pointer flex gap-2 items-center justify-between group px-2 py-[.1rem] rounded-lg hover:bg-gray-500 hover:bg-opacity-10`
405+
const linkClasses = `flex gap-2 items-center justify-between group px-2 py-[.1rem] rounded-lg hover:bg-gray-500/10`
406406

407407
return (
408408
<li key={i}>
@@ -422,7 +422,7 @@ export function DocsLayout({
422422
includeHash: false,
423423
includeSearch: false,
424424
}}
425-
className="!cursor-pointer relative"
425+
className="relative"
426426
>
427427
{(props) => {
428428
return (
@@ -431,7 +431,7 @@ export function DocsLayout({
431431
className={twMerge(
432432
'overflow-auto w-full',
433433
props.isActive
434-
? `font-bold text-transparent bg-clip-text bg-gradient-to-r ${colorFrom} ${colorTo}`
434+
? `font-bold text-transparent bg-clip-text bg-linear-to-r ${colorFrom} ${colorTo}`
435435
: ''
436436
)}
437437
>
@@ -494,7 +494,7 @@ export function DocsLayout({
494494
<details
495495
ref={detailsRef as any}
496496
id="docs-details"
497-
className="border-b border-gray-500 border-opacity-20"
497+
className="border-b border-gray-500/20"
498498
>
499499
<summary className="p-4 flex gap-2 items-center justify-between">
500500
<div className="flex-1 flex gap-2 items-center text-xl md:text-2xl">
@@ -503,11 +503,7 @@ export function DocsLayout({
503503
{logo}
504504
</div>
505505
</summary>
506-
<div
507-
className="flex flex-col gap-4 p-4 whitespace-nowrap h-[0vh] overflow-y-auto
508-
border-t border-gray-500 border-opacity-20 bg-white/20 text-lg
509-
dark:bg-black/20"
510-
>
506+
<div className="flex flex-col gap-4 p-4 whitespace-nowrap overflow-y-auto border-t border-gray-500/20 bg-white/20 text-lg dark:bg-black/20">
511507
<div className="flex gap-4">
512508
<FrameworkSelect
513509
label={frameworkConfig.label}
@@ -581,7 +577,7 @@ export function DocsLayout({
581577
{children}
582578
</div>
583579
<AdGate>
584-
<div className="mb-8 !py-0 mx-auto max-w-full overflow-x-hidden">
580+
<div className="mb-8 !py-0! mx-auto max-w-full overflow-x-hidden">
585581
<GamFooter />
586582
</div>
587583
</AdGate>
@@ -609,7 +605,7 @@ export function DocsLayout({
609605
>
610606
<div className="flex gap-2 items-center font-bold">
611607
<span
612-
className={`bg-gradient-to-r ${colorFrom} ${colorTo} bg-clip-text text-transparent`}
608+
className={`bg-linear-to-r ${colorFrom} ${colorTo} bg-clip-text text-transparent`}
613609
>
614610
{nextItem.label}
615611
</span>{' '}

src/components/DocsLogo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const DocsLogo = ({
1616
colorTo,
1717
libraryId,
1818
}: Props) => {
19-
const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${colorFrom} ${colorTo}`
19+
const gradientText = `inline-block text-transparent bg-clip-text bg-linear-to-r ${colorFrom} ${colorTo}`
2020

2121
return (
2222
<>

src/components/FileExplorer.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import svelteIconUrl from '~/images/file-icons/svelte.svg?url'
88
import vueIconUrl from '~/images/file-icons/vue.svg?url'
99
import textIconUrl from '~/images/file-icons/txt.svg?url'
1010
import type { GitHubFileNode } from '~/utils/documents.server'
11+
import { twMerge } from 'tailwind-merge'
1112

1213
const getFileIconPath = (filename: string) => {
1314
const ext = filename.split('.').pop()?.toLowerCase() || ''
@@ -210,7 +211,7 @@ export function FileExplorer({
210211
width: isSidebarOpen ? sidebarWidth : 0,
211212
paddingRight: isSidebarOpen ? '0.5rem' : 0,
212213
}}
213-
className={`flex-shrink-0 overflow-y-auto bg-gradient-to-r from-gray-50 via-gray-50 to-transparent dark:from-gray-800/50 dark:via-gray-800/50 dark:to-transparent shadow-sm ${
214+
className={`shrink-0 overflow-y-auto bg-linear-to-r from-gray-50 via-gray-50 to-transparent dark:from-gray-800/50 dark:via-gray-800/50 dark:to-transparent shadow-sm ${
214215
isResizing ? '' : 'transition-all duration-300'
215216
}`}
216217
>
@@ -289,16 +290,14 @@ const RenderFileTree = (props: {
289290
onMouseEnter={() =>
290291
file.type !== 'dir' && props.prefetchFileContent(file.path)
291292
}
292-
className={`px-2 py-1.5 text-left w-full flex items-center gap-2 text-sm rounded transition-colors duration-200 min-w-0 ${
293+
className={twMerge(
294+
`px-2 py-1.5 text-left w-full flex items-center gap-2 text-sm rounded transition-colors duration-200 min-w-0`,
293295
props.currentPath === file.path
294-
? `${props.libraryColor.replace(
295-
'bg-',
296-
'bg-opacity-20 bg-'
297-
)} text-gray-900 dark:text-white shadow-sm`
296+
? `${props.libraryColor}/20 text-gray-900 dark:text-white shadow-sm`
298297
: 'hover:bg-gray-200 dark:hover:bg-gray-700 text-gray-700 dark:text-gray-300'
299-
}`}
298+
)}
300299
>
301-
<span className="flex-shrink-0 select-none">
300+
<span className="shrink-0 select-none">
302301
{file.type === 'dir' ? (
303302
<FolderIcon isOpen={props.expandedFolders.has(file.path)} />
304303
) : (

0 commit comments

Comments
 (0)