Skip to content

Commit 0f86ed4

Browse files
derekphilipauderekphilipau
authored
Merge pull request #35 from derekphilipau/dev
Dev
2 parents e047e5f + 3d63651 commit 0f86ed4

21 files changed

+1905
-900
lines changed

‎app/globals.css

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,86 @@
11
@tailwind base;
22
@tailwind components;
33
@tailwind utilities;
4-
4+
55
@layer base {
66
:root {
77
--background: 0 0% 100%;
88
--foreground: 0 0% 3.9%;
9-
10-
--muted: 0 0% 96.1%;
11-
--muted-foreground: 0 0% 45.1%;
12-
13-
--popover: 0 0% 100%;
14-
--popover-foreground: 0 0% 3.9%;
15-
9+
1610
--card: 0 0% 100%;
1711
--card-foreground: 0 0% 3.9%;
18-
19-
--border: 0 0% 89.8%;
20-
--input: 0 0% 89.8%;
21-
12+
13+
--popover: 0 0% 100%;
14+
--popover-foreground: 0 0% 3.9%;
15+
2216
--primary: 0 0% 9%;
2317
--primary-foreground: 0 0% 98%;
24-
18+
2519
--secondary: 0 0% 96.1%;
2620
--secondary-foreground: 0 0% 9%;
27-
21+
22+
--muted: 0 0% 96.1%;
23+
--muted-foreground: 0 0% 45.1%;
24+
2825
--accent: 0 0% 96.1%;
2926
--accent-foreground: 0 0% 9%;
30-
27+
3128
--destructive: 0 84.2% 60.2%;
3229
--destructive-foreground: 0 0% 98%;
33-
34-
--ring: 0 0% 63.9%;
35-
30+
31+
--border: 0 0% 89.8%;
32+
--input: 0 0% 89.8%;
33+
--ring: 0 0% 3.9%;
34+
3635
--radius: 0.5rem;
3736
}
38-
37+
3938
.dark {
4039
--background: 0 0% 3.9%;
4140
--foreground: 0 0% 98%;
42-
43-
--muted: 0 0% 14.9%;
44-
--muted-foreground: 0 0% 63.9%;
45-
46-
--popover: 0 0% 3.9%;
47-
--popover-foreground: 0 0% 98%;
48-
41+
4942
--card: 0 0% 3.9%;
5043
--card-foreground: 0 0% 98%;
51-
52-
--border: 0 0% 14.9%;
53-
--input: 0 0% 14.9%;
54-
44+
45+
--popover: 0 0% 3.9%;
46+
--popover-foreground: 0 0% 98%;
47+
5548
--primary: 0 0% 98%;
5649
--primary-foreground: 0 0% 9%;
57-
50+
5851
--secondary: 0 0% 14.9%;
5952
--secondary-foreground: 0 0% 98%;
60-
53+
54+
--muted: 0 0% 14.9%;
55+
--muted-foreground: 0 0% 63.9%;
56+
6157
--accent: 0 0% 14.9%;
6258
--accent-foreground: 0 0% 98%;
63-
59+
6460
--destructive: 0 62.8% 30.6%;
65-
--destructive-foreground: 0 85.7% 97.3%;
66-
67-
--ring: 0 0% 14.9%;
61+
--destructive-foreground: 0 0% 98%;
62+
63+
--border: 0 0% 14.9%;
64+
--input: 0 0% 14.9%;
65+
--ring: 0 0% 83.1%;
6866
}
6967
}
70-
68+
7169
@layer base {
7270
* {
7371
@apply border-border;
7472
}
75-
7673
body {
7774
@apply bg-background text-foreground;
78-
font-feature-settings: "rlig" 1, "calt" 1;
79-
}
8075

81-
input[type="search"] {
82-
-webkit-appearance: none !important;
76+
input[type='search'] {
77+
-webkit-appearance: none !important;
78+
}
8379
}
8480
}
8581

8682
@media (max-width: 640px) {
8783
.container {
8884
@apply px-4;
8985
}
90-
}
86+
}

‎app/globals.css.old

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
@tailwind base;
2+
@tailwind components;
3+
@tailwind utilities;
4+
5+
@layer base {
6+
:root {
7+
--background: 0 0% 100%;
8+
--foreground: 0 0% 3.9%;
9+
10+
--muted: 0 0% 96.1%;
11+
--muted-foreground: 0 0% 45.1%;
12+
13+
--popover: 0 0% 100%;
14+
--popover-foreground: 0 0% 3.9%;
15+
16+
--card: 0 0% 100%;
17+
--card-foreground: 0 0% 3.9%;
18+
19+
--border: 0 0% 89.8%;
20+
--input: 0 0% 89.8%;
21+
22+
--primary: 0 0% 9%;
23+
--primary-foreground: 0 0% 98%;
24+
25+
--secondary: 0 0% 96.1%;
26+
--secondary-foreground: 0 0% 9%;
27+
28+
--accent: 0 0% 96.1%;
29+
--accent-foreground: 0 0% 9%;
30+
31+
--destructive: 0 84.2% 60.2%;
32+
--destructive-foreground: 0 0% 98%;
33+
34+
--ring: 0 0% 63.9%;
35+
36+
--radius: 0.5rem;
37+
}
38+
39+
.dark {
40+
--background: 0 0% 3.9%;
41+
--foreground: 0 0% 98%;
42+
43+
--muted: 0 0% 14.9%;
44+
--muted-foreground: 0 0% 63.9%;
45+
46+
--popover: 0 0% 3.9%;
47+
--popover-foreground: 0 0% 98%;
48+
49+
--card: 0 0% 3.9%;
50+
--card-foreground: 0 0% 98%;
51+
52+
--border: 0 0% 14.9%;
53+
--input: 0 0% 14.9%;
54+
55+
--primary: 0 0% 98%;
56+
--primary-foreground: 0 0% 9%;
57+
58+
--secondary: 0 0% 14.9%;
59+
--secondary-foreground: 0 0% 98%;
60+
61+
--accent: 0 0% 14.9%;
62+
--accent-foreground: 0 0% 98%;
63+
64+
--destructive: 0 62.8% 30.6%;
65+
--destructive-foreground: 0 85.7% 97.3%;
66+
67+
--ring: 0 0% 14.9%;
68+
}
69+
}
70+
71+
@layer base {
72+
* {
73+
@apply border-border;
74+
}
75+
76+
body {
77+
@apply bg-background text-foreground;
78+
font-feature-settings:
79+
'rlig' 1,
80+
'calt' 1;
81+
}
82+
83+
input[type='search'] {
84+
-webkit-appearance: none !important;
85+
}
86+
}
87+
88+
@media (max-width: 640px) {
89+
.container {
90+
@apply px-4;
91+
}
92+
}

‎components.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$schema": "https://ui.shadcn.com/schema.json",
33
"style": "default",
44
"rsc": true,
5+
"tsx": true,
56
"tailwind": {
67
"config": "tailwind.config.js",
78
"css": "app/globals.css",
@@ -12,4 +13,4 @@
1213
"components": "@/components",
1314
"utils": "@/lib/utils"
1415
}
15-
}
16+
}

‎components/artwork/description-row.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ export function DescriptionRow({
6666
!link &&
6767
val.map(
6868
(tag: string, i: Key) =>
69-
tag && <span key={i}>{`${i > 0 ? ', ' : ''}${tag}`}</span>
69+
tag && (
70+
<span key={i}>{`${(i as number) > 0 ? ', ' : ''}${tag}`}</span>
71+
)
7072
)}
7173
</dd>
7274
</div>

‎components/search/search-agg.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ export function SearchAgg({
155155
className="text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
156156
>
157157
{option.key}
158-
{option.doc_count ? ` (${option.doc_count})` : ''}
158+
<span className="text-muted-foreground">
159+
{option.doc_count ? ` ${option.doc_count}` : ''}
160+
</span>
159161
</Label>
160162
</div>
161163
)
@@ -184,7 +186,9 @@ export function SearchAgg({
184186
className="text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
185187
>
186188
{option.key}
187-
{option.doc_count ? ` (${option.doc_count})` : ''}
189+
<span className="text-muted-foreground">
190+
{option.doc_count ? ` ${option.doc_count}` : ''}
191+
</span>
188192
</Label>
189193
</div>
190194
)

‎components/search/search-as-you-type-input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
Popover,
1818
PopoverAnchor,
1919
PopoverContent,
20-
} from '@/components/ui/popover-local';
20+
} from '@/components/ui/popover';
2121

2222
interface SearchAsYouTypeInputProps {
2323
params?: SearchParams;

‎components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
55
import { cn } from '@/lib/utils';
66

77
const buttonVariants = cva(
8-
'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
8+
'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
99
{
1010
variants: {
1111
variant: {

0 commit comments

Comments
 (0)