Skip to content

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

💄 Remove squircle (#1209)

Luke Vellaffb4922084d1
diff --git a/apps/web/src/app/[locale]/(admin)/app-card.tsx b/apps/web/src/app/[locale]/(admin)/app-card.tsx
index 7e6b58290..cad1795c6 100644
--- a/apps/web/src/app/[locale]/(admin)/app-card.tsx
+++ b/apps/web/src/app/[locale]/(admin)/app-card.tsx
@@ -2,8 +2,6 @@ import { cn } from "@rallly/ui";
import { BarChart2Icon } from "lucide-react";
import React from "react";
-import { Squircle } from "@/app/components/squircle";
-
export function AppCard({
children,
className,
@@ -33,15 +31,16 @@ export function GroupPollIcon({
size?: "xs" | "sm" | "md" | "lg";
}) {
return (
- <Squircle
- aria-label="Group Poll"
+ <div
+ role="img"
+ aria-label="Group Poll Icon"
className={cn(
"inline-flex items-center justify-center bg-gradient-to-br from-purple-500 to-violet-500 text-purple-100",
{
- "size-6": size === "xs",
- "size-8": size === "sm",
- "size-9": size === "md",
- "size-10": size === "lg",
+ "size-6 rounded": size === "xs",
+ "size-8 rounded-md": size === "sm",
+ "size-9 rounded-md": size === "md",
+ "size-10 rounded-lg": size === "lg",
},
)}
>
@@ -52,7 +51,7 @@ export function GroupPollIcon({
"size-6": size === "lg",
})}
/>
- </Squircle>
+ </div>
);
}
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index 07b725ef2..2ed4acd75 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -7,7 +7,6 @@ import { Viewport } from "next";
import { Inter } from "next/font/google";
import React from "react";
-import { SquircleClipPath } from "@/app/components/squircle";
import { Providers } from "@/app/providers";
const inter = Inter({
@@ -37,7 +36,6 @@ export default function Root({
<html lang={locale} className={inter.className}>
<body>
<Toaster />
- <SquircleClipPath />
<Providers>{children}</Providers>
</body>
</html>
diff --git a/apps/web/src/app/components/squircle.tsx b/apps/web/src/app/components/squircle.tsx
deleted file mode 100644
index 98429952d..000000000
--- a/apps/web/src/app/components/squircle.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Slot } from "@radix-ui/react-slot";
-import { cn } from "@rallly/ui";
-
-export function Squircle({
- children,
- asChild,
- className,
- style,
-}: {
- children?: React.ReactNode;
- className?: string;
- asChild?: boolean;
- style?: React.CSSProperties;
-}) {
- const Comp = asChild ? Slot : "div";
- return (
- <>
- <Comp
- className={cn("relative", className)}
- style={{
- clipPath: `url(#squircleClip)`,
- ...style,
- }}
- >
- {children}
- </Comp>
- </>
- );
-}
-
-export function SquircleClipPath() {
- return (
- <svg
- width="0"
- height="0"
- aria-hidden="true"
- className="pointer-events-none absolute"
- >
- <defs>
- <clipPath id="squircleClip" clipPathUnits="objectBoundingBox">
- <path d="M 0,0.5 C 0,0 0,0 0.5,0 S 1,0 1,0.5 1,1 0.5,1 0,1 0,0.5" />
- </clipPath>
- </defs>
- </svg>
- );
-}