Skip to content

Commit 575e0c1

Browse files
committed
Fixed colors
1 parent 99c85a9 commit 575e0c1

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

dev-dist/sw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ define(['./workbox-5357ef54'], function (workbox) {
8181
[
8282
{
8383
url: 'index.html',
84-
revision: '0.mtq2duqj29g',
84+
revision: '0.4hfq3gsql8',
8585
},
8686
],
8787
{},

src/components/ActivityRow/ActivityRow.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Stage } from '@/extensions/org.cubingusa.natshelper.v1/types';
66
import { useNow } from '@/hooks/useNow';
77
import { activityCodeToName } from '@/lib/activityCodes';
88
import { formatTimeRange } from '@/lib/time';
9-
import { Pill } from '../Pill';
9+
import { RoomPill } from '../Pill';
1010

1111
interface ActivityRowProps {
1212
activity: Activity;
@@ -38,15 +38,15 @@ export function ActivityRow({ activity, stage, timeZone, showRoom = true }: Acti
3838
)}
3939
to={`/competitions/${competitionId}/activities/${activity.id}`}>
4040
<span>{activityName}</span>
41-
<span className="text-xs md:text-sm font-light flex justify-between">
41+
<span className="flex justify-between text-xs font-light md:text-sm">
4242
{showRoom && stage && (
43-
<Pill
44-
className="mr-2 px-1 rounded"
43+
<RoomPill
44+
className="px-1 mr-2 rounded"
4545
style={{
4646
backgroundColor: `${stage.color}70`,
4747
}}>
4848
{stage.name}
49-
</Pill>
49+
</RoomPill>
5050
)}
5151
<span>{formatTimeRange(activity.startTime, activity.endTime, 5, timeZone)}</span>
5252
</span>

src/components/Pill/Pill.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,15 @@ export const BaseAssignmentPill = ({ className, ...props }: PillProps) => {
3737
/>
3838
);
3939
};
40+
41+
export const RoomPill = ({ className, ...props }: PillProps) => {
42+
return (
43+
<span
44+
className={classNames(
45+
`inline-flex justify-center items-center px-2 py-1 ring-1 ring-inset font-medium rounded-md bg-gray-100 text-gray-800 shadow-sm dark:ring-gray-600 dark:bg-gray-700 dark:text-gray-200 dark:shadow-gray-800`,
46+
className,
47+
)}
48+
{...props}
49+
/>
50+
);
51+
};

0 commit comments

Comments
 (0)