Skip to content

Commit e0e4b09

Browse files
authored
Barbie pink theme for April 1st (#3071)
1 parent 4054c79 commit e0e4b09

File tree

32 files changed

+287
-169
lines changed

32 files changed

+287
-169
lines changed
314 KB
Loading

apps/web/public/glitter.mp4

70.2 KB
Binary file not shown.

apps/web/src/app/arrangementer/[slug]/[eventId]/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const mapToImageAndName = (item: Group | Company, type: OrganizerType) => (
4848
<Link
4949
href={createOrganizerPageUrl(item)}
5050
key={item.name}
51-
className="flex flex-row gap-2 items-center px-3 py-2 rounded-lg border border-gray-200 hover:bg-gray-100 dark:border-stone-700 dark:hover:bg-stone-800"
51+
className="flex flex-row gap-2 items-center px-3 py-2 rounded-lg border border-gray-200 hover:bg-gray-100 dark:border-stone-700 dark:hover:bg-stone-800 in-data-[theme=pink]:hover:bg-pink-300 in-data-[theme=pink]:border-pink-300"
5252
>
5353
{item.imageUrl && (
5454
<Image
@@ -199,11 +199,11 @@ const EventContent = ({ event, attendance, parentEvent, parentAttendance, punish
199199
</div>
200200

201201
<div className="flex flex-1 flex-col gap-8 sm:gap-4 md:min-w-88 lg:min-w-104">
202-
<div className="sm:hidden h-1 rounded-full w-full bg-gray-200 dark:bg-stone-700" />
202+
<div className="sm:hidden h-1 rounded-full w-full bg-gray-200 dark:bg-stone-700 in-data-[theme=pink]:bg-pink-500" />
203203
<TimeLocationBox event={event} />
204204
{attendance !== null && (
205205
<>
206-
<div className="sm:hidden h-1 rounded-full w-full bg-gray-200 dark:bg-stone-700" />
206+
<div className="sm:hidden h-1 rounded-full w-full bg-gray-200 dark:bg-stone-700 in-data-[theme=pink]:bg-pink-500" />
207207

208208
<AttendanceCard
209209
initialAttendance={attendance}

apps/web/src/app/arrangementer/components/AttendanceCard/AttendanceCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export const AttendanceCard = ({
216216
}
217217

218218
return (
219-
<section className="flex flex-col gap-4 min-h-[6rem] sm:p-4 sm:rounded-xl sm:border sm:border-gray-200 sm:dark:border-stone-800 sm:dark:bg-stone-800">
219+
<section className="flex flex-col gap-4 min-h-[6rem] sm:p-4 sm:rounded-xl sm:border sm:border-gray-200 sm:dark:border-stone-800 sm:dark:bg-stone-800 sm:in-data-[theme=pink]:border-none sm:in-data-[theme=pink]:bg-pink-100">
220220
<Title element="h2" size="lg">
221221
Påmelding
222222
</Title>

apps/web/src/app/arrangementer/components/EventHeader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const EventHeader: FC<Props> = ({ event, showDashboardLink }) => {
2626
tiltMaxAngleX={0.25}
2727
tiltMaxAngleY={0.25}
2828
glareMaxOpacity={0.1}
29-
className="rounded-xl bg-gray-100 dark:bg-stone-800"
29+
className="rounded-xl bg-gray-100 dark:bg-stone-800 in-data-[theme=pink]:bg-pink-100"
3030
>
3131
<div className="group relative w-full aspect-video md:aspect-24/9 overflow-hidden rounded-xl">
3232
{event.imageUrl ? (
@@ -60,7 +60,7 @@ export const EventHeader: FC<Props> = ({ event, showDashboardLink }) => {
6060
<div className="absolute right-3 top-3 z-10 hidden opacity-0 transition-opacity duration-200 md:block md:group-hover:opacity-100">
6161
<Button
6262
variant="solid"
63-
className="p-2 rounded-md bg-black/40 text-white hover:bg-black/50 dark:bg-black/40 dark:hover:bg-black/50"
63+
className="p-2 rounded-md bg-black/40 text-white hover:bg-black/50 dark:bg-black/40 dark:hover:bg-black/50 in-data-[theme=pink]:bg-pink-500/40 in-data-[theme=pink]:hover:bg-pink-500/50"
6464
onClick={() => setShowFullImage((prev) => !prev)}
6565
aria-label={showFullImage ? "Fyll rammen" : "Se hele bildet"}
6666
>
@@ -86,7 +86,7 @@ export const EventHeader: FC<Props> = ({ event, showDashboardLink }) => {
8686
target="_blank"
8787
rel="noopener noreferrer"
8888
variant="unstyled"
89-
className="w-fit p-1.5 bg-blue-100 hover:bg-blue-50 rounded-md transition-colors dark:bg-stone-700 dark:hover:bg-stone-600 gap-1.5"
89+
className="w-fit p-1.5 bg-blue-100 hover:bg-blue-50 rounded-md transition-colors dark:bg-stone-700 dark:hover:bg-stone-600 in-data-[theme=pink]:bg-pink-100 in-data-[theme=pink]:hover:bg-pink-300 gap-1.5"
9090
title="Rediger arrangement"
9191
>
9292
<IconEdit className="size-[1.25em] md:w-6 md:h-6" />

apps/web/src/app/arrangementer/components/EventList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ export const EventList: FC<EventListProps> = ({
194194

195195
const Divider = ({ text }: { text: string }) => (
196196
<div className="w-full flex flex-row items-center gap-2 sm:-my-1">
197-
<span className="grow h-[2px] bg-gray-200 dark:bg-stone-700 rounded-full" />
198-
<Text className="text-gray-400 dark:text-stone-600 text-xs uppercase tracking-widest font-medium select-none">
197+
<span className="grow h-[2px] bg-gray-200 dark:bg-stone-700 in-data-[theme=pink]:bg-pink-300 rounded-full" />
198+
<Text className="text-gray-400 dark:text-stone-600 in-data-[theme=pink]:text-pink-600 text-xs uppercase tracking-widest font-medium select-none">
199199
{text}
200200
</Text>
201-
<span className="grow h-[2px] bg-gray-200 dark:bg-stone-700 rounded-full" />
201+
<span className="grow h-[2px] bg-gray-200 dark:bg-stone-700 in-data-[theme=pink]:bg-pink-300 rounded-full" />
202202
</div>
203203
)
204204

apps/web/src/app/arrangementer/components/TimeLocationBox/ActionLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const ActionLink = ({ href, label }: Props) => (
1313
<TooltipTrigger>
1414
<Link
1515
className={clsx(
16-
"border border-gray-200 hover:bg-gray-100 dark:border-stone-700 dark:hover:bg-stone-700 p-1.5 rounded-lg flex items-center"
16+
"border border-gray-200 hover:bg-gray-100 dark:border-stone-700 dark:hover:bg-stone-700 in-data-[theme=pink]:hover:bg-pink-200 in-data-[theme=pink]:border-pink-300 p-1.5 rounded-lg flex items-center"
1717
)}
1818
href={href}
1919
target="_blank"

apps/web/src/app/arrangementer/components/TimeLocationBox/TimeLocationBox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface TimeLocationBoxProps {
1010

1111
export const TimeLocationBox: FC<TimeLocationBoxProps> = ({ event }) => {
1212
return (
13-
<section className="flex flex-col gap-4 min-h-24 rounded-lg sm:border sm:border-gray-200 sm:dark:border-stone-800 sm:dark:bg-stone-800 sm:p-4 sm:rounded-xl">
13+
<section className="flex flex-col gap-4 min-h-24 rounded-lg sm:border sm:border-gray-200 sm:dark:border-stone-800 sm:dark:bg-stone-800 sm:in-data-[theme=pink]:border-none sm:in-data-[theme=pink]:bg-pink-100 sm:p-4 sm:rounded-xl">
1414
<Title element="h2">Oppmøte</Title>
1515
<div className="flex flex-col gap-6 pl-2 sm:pl-0">
1616
<TimeBox event={event} />

apps/web/src/app/arrangementer/components/filters/FilterChips.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ export const FilterChips = ({
8484
"bg-blue-100 dark:bg-sky-950",
8585
"text-blue-900 dark:text-sky-200",
8686
"hover:bg-blue-200 dark:hover:bg-sky-900",
87+
"in-data-[theme=pink]:text-pink-600 in-data-[theme=pink]:hover:text-pink-700 in-data-[theme=pink]:bg-pink-100 in-data-[theme=pink]:hover:bg-pink-300",
8788
"transition"
8889
)}
8990
>
@@ -92,7 +93,12 @@ export const FilterChips = ({
9293
</button>
9394
))}
9495

95-
<Button onClick={onResetAll} variant="solid" size="sm" className="text-sm rounded-full px-3 py-1.5">
96+
<Button
97+
onClick={onResetAll}
98+
variant="solid"
99+
size="sm"
100+
className="text-sm rounded-full px-3 py-1.5 in-data-[theme=pink]:text-pink-600 in-data-[theme=pink]:hover:text-pink-700 in-data-[theme=pink]:bg-pink-300 in-data-[theme=pink]:hover:bg-pink-400"
101+
>
96102
Fjern alle
97103
</Button>
98104
</div>

apps/web/src/app/arrangementer/components/filters/GroupFilter.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ export const GroupFilter = ({ value, onChange, groups }: GroupFilterProps) => {
3333
className={cn(
3434
"cursor-pointer w-full flex items-center justify-between gap-2 font-medium text-gray-500",
3535
"[&[data-state=open]>svg]:rotate-180",
36-
"hover:text-gray-900 dark:text-stone-400 dark:hover:text-stone-100 transition-colors"
36+
"hover:text-gray-900 dark:text-stone-400 dark:hover:text-stone-100 transition-colors",
37+
"in-data-[theme=pink]:text-pink-600 in-data-[theme=pink]:hover:text-pink-700"
3738
)}
3839
>
3940
<div className="flex items-center gap-2 h-5.5">
4041
<Label className="cursor-pointer">Arrangør</Label>
4142
{value.length > 0 && (
42-
<span className="size-5.5 flex items-center justify-center text-xs bg-blue-100 dark:bg-sky-900 text-blue-900 dark:text-sky-100 rounded-full">
43+
<span className="size-5.5 flex items-center justify-center text-xs bg-blue-100 dark:bg-sky-900 in-data-[theme=pink]:bg-pink-100 text-blue-900 dark:text-sky-100 in-data-[theme=pink]:text-pink-600 in-data-[theme=pink]:hover:text-pink-700 rounded-full">
4344
{value.length}
4445
</span>
4546
)}
@@ -54,7 +55,7 @@ export const GroupFilter = ({ value, onChange, groups }: GroupFilterProps) => {
5455
"data-[state=closed]:animate-collapsible-up"
5556
)}
5657
>
57-
<div className="relative flex flex-col border border-gray-200 dark:border-stone-700 rounded-xl">
58+
<div className="relative flex flex-col border border-gray-200 dark:border-stone-700 in-data-[theme=pink]:border-pink-300 in-data-[theme=pink]:text-pink-600 rounded-xl">
5859
<div className="relative m-0.5">
5960
<IconSearch className="w-7 h-full pointer-events-none absolute inset-y-0 left-0 flex items-center justify-center pl-3" />
6061
<TextInput
@@ -65,7 +66,7 @@ export const GroupFilter = ({ value, onChange, groups }: GroupFilterProps) => {
6566
/>
6667
</div>
6768

68-
<div className="flex flex-col gap-1 md:max-h-60 overflow-y-auto p-2 border-t border-gray-200 dark:border-stone-700">
69+
<div className="flex flex-col gap-1 md:max-h-60 overflow-y-auto p-2 border-t border-gray-200 dark:border-stone-700 in-data-[theme=pink]:border-pink-300">
6970
{filtered.map((group) => {
7071
const isSelected = value.includes(group.slug)
7172
return (
@@ -76,8 +77,8 @@ export const GroupFilter = ({ value, onChange, groups }: GroupFilterProps) => {
7677
className={cn(
7778
"flex items-center justify-between px-3 py-2 rounded-md text-sm transition-colors",
7879
isSelected
79-
? "bg-blue-100 dark:bg-sky-900 text-blue-900 dark:text-sky-100"
80-
: "hover:bg-gray-100 dark:hover:bg-stone-800"
80+
? "bg-blue-100 dark:bg-sky-900 text-blue-900 dark:text-sky-100 in-data-[theme=pink]:bg-pink-100 in-data-[theme=pink]:text-pink-600"
81+
: "hover:bg-gray-100 dark:hover:bg-stone-800 in-data-[theme=pink]:hover:bg-pink-100"
8182
)}
8283
>
8384
<span>{group.abbreviation}</span>

0 commit comments

Comments
 (0)