Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 More style updates

Luke Vella866c6f3d0913
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item.tsx
index 7ac116cec..dfbae36a3 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item.tsx
@@ -1,6 +1,5 @@
"use client";
-import { Icon } from "@rallly/ui/icon";
import { SidebarMenuButton, SidebarMenuItem } from "@rallly/ui/sidebar";
import { GaugeIcon } from "lucide-react";
import Link from "next/link";
@@ -18,9 +17,7 @@ export function ControlPanelMenuItem() {
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Link href="/control-panel">
- <Icon>
- <GaugeIcon />
- </Icon>
+ <GaugeIcon />
<Trans i18nKey="controlPanel" defaults="Control Panel" />
</Link>
</SidebarMenuButton>
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item.tsx
index 5b08eb881..4a4bf6d64 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item.tsx
@@ -2,7 +2,6 @@
import { usePostHog } from "@rallly/posthog/client";
import { useDialog } from "@rallly/ui/dialog";
-import { Icon } from "@rallly/ui/icon";
import { SidebarMenuButton, SidebarMenuItem } from "@rallly/ui/sidebar";
import { MegaphoneIcon } from "lucide-react";
import { FeedbackDialog } from "@/features/feedback/components/feedback-dialog";
@@ -21,9 +20,7 @@ export function FeedbackMenuItem() {
dialog.trigger();
}}
>
- <Icon>
- <MegaphoneIcon />
- </Icon>
+ <MegaphoneIcon />
<Trans i18nKey="sendFeedback" defaults="Send Feedback" />
</SidebarMenuButton>
</SidebarMenuItem>
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx
index d0a877258..365c7e816 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx
@@ -23,7 +23,7 @@ export function UpgradeMenuItem() {
showPayWall();
}}
>
- <SparklesIcon className="size-4" />
+ <SparklesIcon />
<Trans i18nKey="upgradeToPro" defaults="Upgrade to Pro" />
</SidebarMenuButton>
</SidebarMenuItem>
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx
index fe6823b78..b080b4a04 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx
@@ -1,4 +1,3 @@
-import { Icon } from "@rallly/ui/icon";
import {
Sidebar,
SidebarContent,
@@ -65,9 +64,7 @@ export default async function Layout({
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Link href="/settings/preferences">
- <Icon>
- <Settings2Icon />
- </Icon>
+ <Settings2Icon />
<Trans i18nKey="preferences" defaults="Preferences" />
</Link>
</SidebarMenuButton>
diff --git a/apps/web/src/utils/color.ts b/apps/web/src/utils/color.ts
index f1a06fe0f..06c69fb8b 100644
--- a/apps/web/src/utils/color.ts
+++ b/apps/web/src/utils/color.ts
@@ -78,7 +78,7 @@ export function getForegroundColor(backgroundColor: string): string {
export function adjustColorForContrast(
color: string,
backgroundColor: string,
- minContrastRatio = 3.0,
+ minContrastRatio = 3.5,
): string {
const colorRgb = hexToRgb(color);
const bgRgb = hexToRgb(backgroundColor);
diff --git a/packages/ui/src/switch.tsx b/packages/ui/src/switch.tsx
index df6265c8e..250cd5db5 100644
--- a/packages/ui/src/switch.tsx
+++ b/packages/ui/src/switch.tsx
@@ -13,7 +13,7 @@ const Switch = React.forwardRef<
>(({ className, ...props }, ref) => (
<SwitchPrimitives.Root
className={cn(
- "peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full p-0.5 ring-1 ring-black/10 ring-inset transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-muted dark:ring-white/10 dark:data-[state=checked]:bg-gray-400",
+ "peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full p-0.5 ring-1 ring-button-outline ring-inset transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-muted",
className,
)}
{...props}
@@ -21,7 +21,7 @@ const Switch = React.forwardRef<
>
<SwitchPrimitives.Thumb
className={cn(
- "pointer-events-none flex h-full w-4 items-center justify-center rounded-full bg-white shadow-lg ring-0 transition-transform duration-100 data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0 dark:bg-gray-700",
+ "pointer-events-none flex h-full w-4 items-center justify-center rounded-full bg-background shadow-lg ring-0 transition-transform duration-100 data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0 dark:bg-gray-700",
)}
>
{props.icon}