Skip to content

fix: restore Marquee animation and Tailwind v4 compatibility #83

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
naymurdev merged 1 commit into from
Oct 25, 2025
Merged

fix: restore Marquee animation and Tailwind v4 compatibility #83

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
21 changes: 15 additions & 6 deletions apps/ui-layout/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
@import "./token.css";
@import "./code-hike.css";

@source './pages/**/*.{js,ts,jsx,tsx,mdx}';
@source './components/**/*.{js,ts,jsx,tsx,mdx}';
@source './app/**/*.{js,ts,jsx,tsx,mdx}';
@source './content/**/*.{md,mdx}';
@source './registry/**/*.{js,ts,jsx,tsx}';
@source '../../../packages/ui/src/**/*.{js,ts,jsx,tsx}';
@source '../../../packages/blocks/src/**/*.{js,ts,jsx,tsx}';

Expand Down Expand Up @@ -103,12 +108,6 @@
--color-rainbow-2-end: hsl(255 100% 50% / 0.51);
--color-rainbow-2-via: hsl(20 100% 55% / 0.56);

--animate-border: border 4s linear infinite;
--animate-infinite-scroll: infinite-scroll 25s linear infinite;
--animate-marquee: marquee var(--duration) linear infinite;
--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
--animate-marquee-reverse: marquee-reverse var(--duration) linear infinite;
--animate-marquee-vertical-reverse: marquee-vertical-reverse var(--duration) linear infinite;

@keyframes border {
to {
Expand All @@ -123,6 +122,16 @@
transform: translateX(-100%);
}
}
}

@theme inline {
--animate-border: border 4s linear infinite;
--animate-infinite-scroll: infinite-scroll 25s linear infinite;
--animate-marquee: marquee var(--duration) linear infinite;
--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
--animate-marquee-reverse: marquee-reverse var(--duration) linear infinite;
--animate-marquee-vertical-reverse: marquee-vertical-reverse var(--duration) linear infinite;

@keyframes marquee {
from {
transform: translateX(0);
Expand Down
4 changes: 2 additions & 2 deletions apps/ui-layout/components/ui/marquee.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function Marquee({
<div
{...props}
className={cn(
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-[var(--gap)]',
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-(--gap)',
{
'flex-row': !vertical,
'flex-col': vertical,
Expand All @@ -36,7 +36,7 @@ export function Marquee({
.map((_, i) => (
<div
key={i}
className={cn('flex shrink-0 justify-around gap-[var(--gap)]', {
className={cn('flex shrink-0 justify-around gap-(--gap)', {
'animate-marquee flex-row': !vertical && !reverse,
'animate-marquee-vertical flex-col': vertical && !reverse,
'animate-marquee-reverse flex-row': !vertical && reverse,
Expand Down
28 changes: 24 additions & 4 deletions apps/ui-layout/content/components/marquee.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,13 @@ export const metadata = {
```css global.css
@import "tailwindcss";

@theme {
@theme inline {
--animate-border: border 4s linear infinite;
--animate-infinite-scroll: infinite-scroll 25s linear infinite;
--animate-marquee: marquee var(--duration) linear infinite;
--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
--animate-marquee-reverse: marquee-reverse var(--duration) linear infinite;
--animate-marquee-vertical-reverse: marquee-vertical-reverse var(--duration) linear infinite;

@keyframes marquee {
from {
Expand All @@ -102,6 +106,22 @@ export const metadata = {
transform: translateY(calc(-100% - var(--gap)));
}
}
@keyframes marquee-reverse {
from {
transform: translateX(calc(-100% - var(--gap)));
}
to {
transform: translateX(0);
}
}
@keyframes marquee-vertical-reverse {
from {
transform: translateY(calc(-100% - var(--gap)));
}
to {
transform: translateY(0);
}
}
}
```

Expand Down Expand Up @@ -131,7 +151,7 @@ export default function Marquee({
<div
{...props}
className={cn(
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-[var(--gap)]',
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-(--gap)',
{
'flex-row': !vertical,
'flex-col': vertical,
Expand All @@ -144,7 +164,7 @@ export default function Marquee({
.map((_, i) => (
<div
key={i}
className={cn('flex shrink-0 justify-around gap-[var(--gap)]', {
className={cn('flex shrink-0 justify-around gap-(--gap)', {
'animate-marquee flex-row': !vertical && !reverse,
'animate-marquee-vertical flex-col': vertical && !reverse,
'animate-marquee-reverse flex-row': !vertical && reverse,
Expand All @@ -156,7 +176,7 @@ export default function Marquee({
</div>
))}
</div>
);
)
}
```

Expand Down