Skip to content

moved tailwind v3 -> v4 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2025
Merged

moved tailwind v3 -> v4 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/(docs)/docs/[[...slug]]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function page({ params }: IProps) {
<div className="space-y-12 py-8">
<div className="border-b border-black pb-6">
<Text as="h1">{doc.title}</Text>
<p className="text-lg text-muted mt-2">{doc.description}</p>
<p className="text-lg text-muted-foreground mt-2">{doc.description}</p>
{doc.links && (
<div className="flex space-x-4 text-sm mt-4">
{doc.links?.api_reference && (
Expand Down
8 changes: 5 additions & 3 deletions app/(marketing)/blogs/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ export default function page({ params }: IProps) {
return (
<div className="max-w-3xl mx-auto">
<div className="border-b border-black pb-6 mb-6">
<Text className="text-muted text-sm">
<Text className="text-muted-foreground text-sm">
{format(new Date(blog.publishedAt), "dd, MMMM yyyy")}
</Text>
<Text as="h2" className="mb-2">
{blog.title}
</Text>
<p className="text-lg text-muted mb-8">{blog.description}</p>
<p className="text-lg text-muted-foreground mb-8">
{blog.description}
</p>
<Image
src={blog.coverImage}
alt={blog.title}
Expand All @@ -82,7 +84,7 @@ export default function page({ params }: IProps) {
<Link
href={`https://x.com/@${blog.author.x}`}
target="_blank"
className="text-muted"
className="text-muted-foreground"
>
@{blog.author.x}
</Link>
Expand Down
42 changes: 18 additions & 24 deletions app/(marketing)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,9 @@ export default async function Home() {
<div className="bg-[url('/images/banner_void_2.svg')] bg-cover bg-no-repeat bg-center flex flex-col items-center h-[1900px] lg:h-[1400px]">
<section className="container max-w-6xl mx-auto px-4 lg:px-0 text-gray-900 flex justify-center items-center lg:gap-28 xl:gap-32 my-28">
<div className="text-center lg:text-left w-full lg:w-2/3">
<Link
id="checkout-figma-kit"
data-umami-event="checkout-figma-kit"
href="https://dub.sh/retroui-figma"
target="_blank"
className="mb-6 inline-block"
>
<Link href="/docs" className="mb-6 inline-block">
<Badge>
Checkout Retro UI Figma Kit{" "}
We upgraded to TailwindCSS v4{" "}
<ArrowRightIcon className="ml-2 h-4 w-4 inline-block" />
</Badge>
</Link>
Expand All @@ -80,7 +74,7 @@ export default async function Home() {
stand out!
</Text>

<p className="text-lg text-muted mb-8 mt-4">
<p className="text-lg text-muted-foreground mb-8 mt-4">
Retro styled component library based on React and TailwindCSS.
Comes with 40+ free UI components that you can just copy paste
into your projects.
Expand Down Expand Up @@ -187,14 +181,14 @@ export default async function Home() {
Easily <span className="text-outlined">Customize</span> to Your Own
Needs! 🛠️
</Text>
<div className="flex flex-col space-y-1 mt-6 mb-8 text-muted">
<Text className="text-xl">
<div className="flex flex-col space-y-1 mt-6 mb-8 text-muted-foreground">
<Text className="text-lg">
Copy-Paste Ready: Components that you can just copy paste.
</Text>
<Text className="text-xl">
<Text className="text-lg">
Tailwind Based: Customizable with Tailwind CSS.
</Text>
<Text className="text-xl">
<Text className="text-lg">
Type Safe: Typescript support for all components.
</Text>
</div>
Expand Down Expand Up @@ -292,20 +286,20 @@ export default async function Home() {
</div>
</section>

<section className="container max-w-6xl mx-auto px-4 lg:px-0 grid grid-cols-1 lg:grid-cols-2 items-center my-36">
<section className="container max-w-6xl mx-auto px-4 lg:px-0 grid grid-cols-1 lg:grid-cols-2 gap-8 items-center my-36">
<div className="w-full">
<Text as="h2">
The <span className="text-outlined">Figma</span> UI Kit You Were
Looking For!
</Text>
<div className="flex flex-col space-y-1 mt-6 mb-8 text-muted">
<Text className="text-xl">
<div className="flex flex-col space-y-1 mt-6 mb-8 text-muted-foreground">
<Text className="text-lg">
- Based on the design foundation of RetroUI.
</Text>
<Text className="text-xl">
<Text className="text-lg">
- Comes with 60+ UI elements like cards, modals, stats, etc .
</Text>
<Text className="text-xl">
<Text className="text-lg">
- Get Lifetime update of new versions.
</Text>
</div>
Expand All @@ -329,11 +323,11 @@ export default async function Home() {
</div>
</section>

<section className="container max-w-6xl mx-auto border-2 bg-primary-400 border-black py-16 px-4 lg:p-16 my-36">
<section className="container max-w-6xl mx-auto border-2 bg-primary border-black py-16 px-4 lg:p-16 my-36">
<Text as="h2" className="text-center mb-2">
Community Contributors
</Text>
<Text className="text-xl text-center text-muted mb-8">
<Text className="text-xl text-center text-muted-foreground mb-8">
RetroUI core is free and open-source, and it is made possible by our
awesome contributors.
</Text>
Expand Down Expand Up @@ -378,23 +372,23 @@ export default async function Home() {
<footer className="bg-black py-8">
<div className="container max-w-6xl mx-auto flex flex-col lg:flex-row space-y-4 lg:space-y-0 justify-between items-center">
<div className="flex justify-center space-x-4">
<a href="https://twitter.com/ariflogs" className="text-primary-500">
<a href="https://twitter.com/ariflogs" className="text-primary">
Twitter
</a>
<a
href="https://github.com/Logging-Stuff/retroui"
className="text-primary-500"
className="text-primary"
>
GitHub
</a>
<a href="/docs" className="text-primary-500">
<a href="/docs" className="text-primary">
Documentation
</a>
</div>

<p className="text-gray-300 text-sm">
Built by{" "}
<a href="https://twitter.com/ariflogs" className="text-primary-500">
<a href="https://twitter.com/ariflogs" className="text-primary">
Arif Hossain
</a>
.
Expand Down
85 changes: 67 additions & 18 deletions app/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,78 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

@theme {
--font-head: var(--font-head);
--font-sans: var(--font-sans);

--shadow-xs: 1px 1px 0 0 var(--border);
--shadow-sm: 2px 2px 0 0 var(--border);
--shadow-md: 3px 3px 0 0 var(--border);
--shadow-lg: 4px 4px 0 1px var(--border);

--color-background: var(--background);
--color-foreground: var(--foreground);
--color-primary: var(--primary);
--color-primary-hover: var(--primary-hover);
--color-card: var(--card);
--color-card-foreground: var(--card-foreground);
--color-muted: var(--muted);
--color-muted-foreground: var(--muted-foreground);
--color-accent: var(--accent);
--color-accent-foreground: var(--accent-foreground);
--color-destructive: var(--destructive);
--color-destructive-foreground: var(--destructive-foreground);
--color-border: var(--border);
}

:root {
--muted: #606067;
--background: #fff;
--foreground: #000;
--primary-50: #fffef0;
--primary-100: #fffac2;
--primary-200: #fff299;
--primary-300: #ffe766;
--primary-400: #ffdb33;
--primary-500: #ffcc00;
--primary-600: #ffb700;
--primary-700: #ff9f00;
--primary-800: #e68a00;
--primary-900: #b36b00;
--card: #fff;
--card-foreground: #000;
--primary: #ffdb33;
--primary-hover: #ffcc00;
--primary-foreground: #000;
--muted: #aeaeae;
--muted-foreground: #5a5a5a;
--accent: #fae583;
--accent-foreground: #000;
--destructive: #e63946;
--destructive-foreground: #fff;
--border: #000;
}

.dark {
--background: #121212;
--foreground: #fff;
--card: #1e1e1e;
--card-foreground: #fff;
--popover: #1e1e1e;
--popover-foreground: #fff;
--primary: #ffdb33;
--primary-foreground: #000;
--secondary: #292929;
--secondary-foreground: #e5e5e5;
--muted: #3b3b3b;
--muted-foreground: #9a9b9c;
--accent: #ffdb33;
--accent-foreground: #000;
--destructive: #ff6b6b;
--destructive-foreground: #fff;
--border: #333;
--input: #444;
--ring: #ffdb33;
--radius: 0.5rem;
--chart-1: #ff4500;
--chart-2: #ff8c00;
--chart-3: #00b894;
--chart-4: #355070;
--chart-5: #e9c46a;
}

.text-outlined {
/* @apply relative text-primary-400 font-bold; */
letter-spacing: 2px;
text-shadow: 0px 0px 0 theme("colors.primary.400"),
0px 0px 0 theme("colors.primary.400"), 4px 4px 0 theme("colors.primary.400"),
4px 4px 0 theme("colors.primary.400");
text-shadow: 0px 0px 0 var(--color-primary), 0px 0px 0 var(--color-primary),
4px 4px 0 var(--color-primary), 4px 4px 0 var(--color-primary);
}

/* Syntax Highlighting stuff */
Expand Down
8 changes: 4 additions & 4 deletions app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import TopNav from "@/components/TopNav";
import "./global.css";
import { Archivo_Black, Share_Tech, Share_Tech_Mono } from "next/font/google";
import { Archivo_Black, Space_Grotesk, Space_Mono } from "next/font/google";
import { Metadata } from "next";

const archivoBlack = Archivo_Black({
Expand All @@ -10,14 +10,14 @@ const archivoBlack = Archivo_Black({
display: "swap",
});

const shareTech = Share_Tech({
const space = Space_Grotesk({
subsets: ["latin"],
weight: "400",
variable: "--font-sans",
display: "swap",
});

const shareTechMono = Share_Tech_Mono({
const spaceMono = Space_Mono({
subsets: ["latin"],
weight: "400",
variable: "--font-mono",
Expand Down Expand Up @@ -49,7 +49,7 @@ export default function RootLayout({
/>
</head>
<body
className={`${shareTech.className} ${archivoBlack.variable} ${shareTech.variable} ${shareTechMono.variable}`}
className={`${space.className} ${archivoBlack.variable} ${space.variable} ${spaceMono.variable}`}
>
<div className="relative z-40 pb-16">
<TopNav />
Expand Down
2 changes: 1 addition & 1 deletion components/CodeBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function CodeBlock({ className, children, ...props }: ICodeBlock) {
<div className="relative">
<pre
className={cn(
"overflow-x-auto rounded bg-[#282A36] mt-3 mb-6 p-4",
"overflow-x-auto rounded-sm bg-[#282A36] mt-3 mb-6 p-4",
className
)}
{...props}
Expand Down
6 changes: 3 additions & 3 deletions components/ComponentInstall.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ function ComponentInstallManual({ children }: { children: React.ReactNode }) {
function ComponentInstall({ children }: IComponentShowcase) {
return (
<TabGroup>
<TabList className="border-b bg-transparent flex space-x-4 mb-6">
<Tab className="text-lg min-w-12 relative px-2 py-1 border-b-2 border-b-transparent bg-transparent data-[selected]:border-primary-500 data-[selected]:text-foreground focus:outline-none">
<TabList className="border-b bg-transparent flex space-x-4 mb-6 text-sm">
<Tab className="min-w-12 cursor-pointer relative px-2 py-1 bg-transparent data-selected:border data-selected:border-b-0 data-selected:bg-black data-selected:text-white focus:outline-hidden">
CLI
</Tab>
<Tab className="text-lg min-w-12 relative px-2 py-1 border-b-2 border-b-transparent bg-transparent data-[selected]:border-primary-500 data-[selected]:text-foreground focus:outline-none">
<Tab className="min-w-12 cursor-pointer relative px-2 py-1 bg-transparent data-selected:border data-selected:border-b-0 data-selected:bg-black data-selected:text-white focus:outline-hidden">
Manual
</Tab>
</TabList>
Expand Down
10 changes: 5 additions & 5 deletions components/ComponentShowcase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ export function ComponentShowcase({ name, children }: IComponentShowcase) {

return (
<TabGroup>
<TabList className="space-x-4 border-b mb-6">
<Tab className="min-w-12 text-lg relative px-2 py-1 border-b-2 border-b-transparent bg-transparent data-[selected]:border-primary-500 data-[selected]:text-foreground focus:outline-none">
<TabList className="space-x-4 border-b mb-6 text-sm">
<Tab className="min-w-12 cursor-pointer relative px-2 py-1 bg-transparent data-selected:border data-selected:border-b-0 data-selected:bg-black data-selected:text-white focus:outline-hidden">
Preview
</Tab>
<Tab className="min-w-12 text-lg relative px-2 py-1 border-b-2 border-b-transparent bg-transparent data-[selected]:border-primary-500 data-[selected]:text-foreground focus:outline-none">
<Tab className="min-w-12 cursor-pointer relative px-2 py-1 bg-transparent data-selected:border data-selected:border-b-0 data-selected:bg-black data-selected:text-white focus:outline-hidden">
Code
</Tab>
</TabList>
<TabPanels>
<TabPanel>
<div className="border rounded p-6 mt-4">
<div className="border rounded-sm p-6 mt-4">
<Preview />
</div>
</TabPanel>
<TabPanel>
<div className="relative rounded overflow-auto">{Code}</div>
<div className="relative rounded-sm overflow-auto">{Code}</div>
</TabPanel>
</TabPanels>
</TabGroup>
Expand Down
2 changes: 1 addition & 1 deletion components/JoinNewsletter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export function JoinNewsletter() {
<div className="w-full max-w-6xl mx-auto py-16 px-4 border-2 border-black">
<div className="flex flex-col justify-center items-center text-center">
<Text as="h2">Join Our Newsletter</Text>
<p className="text-lg text-muted mb-8">
<p className="text-lg text-muted-foreground mb-8">
Get notified about latest updates and new launches.
</p>

Expand Down
6 changes: 3 additions & 3 deletions components/MDX.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ const components = (type: "doc" | "blog") => ({
href={href}
target={target || "_blank"}
rel={rel || "noopener noreferrer"}
className="underline underline-offset-4 hover:decoration-primary-500"
className="underline underline-offset-4 hover:decoration-primary"
{...rest}
/>
) : (
<Link
href={href}
className="underline underline-offset-4 hover:decoration-primary-500"
className="underline underline-offset-4 hover:decoration-primary"
{...rest}
/>
);
Expand All @@ -82,7 +82,7 @@ const components = (type: "doc" | "blog") => ({
}: React.HTMLAttributes<HTMLElement>) => (
<code
className={cn(
"relative rounded bg-[#282A36] p-1 text-primary-500 text-sm",
"relative rounded-sm bg-[#282A36] p-1 text-primary text-sm",
className
)}
{...props}
Expand Down
4 changes: 2 additions & 2 deletions components/TopNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function TopNav() {
<div className="container max-w-6xl px-4 lg:px-0 mx-auto">
<div className="flex justify-between items-center h-16">
{/* Logo Section */}
<div className="flex-shrink-0">
<div className="shrink-0">
<a
href="/"
className="text-black font-head text-2xl flex items-end"
Expand All @@ -34,7 +34,7 @@ export default function TopNav() {
<Link
key={item.title}
href={item.href}
className="hover:underline decoration-primary-500 underline-offset-2 transition-all"
className="hover:underline decoration-primary underline-offset-2 transition-all"
>
{item.title}
</Link>
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const AccordionHeader = React.forwardRef<
<AccordionPrimitive.Trigger
ref={ref}
className={cn(
"flex flex-1 items-start justify-between px-4 py-2 font-head text-black cursor-pointer focus:outline-none [&[data-state=open]>svg]:rotate-180",
"flex flex-1 items-start justify-between px-4 py-2 font-head text-black cursor-pointer focus:outline-hidden [&[data-state=open]>svg]:rotate-180",
className
)}
{...props}
Expand Down
Loading