Skip to content

Commit ed12d95

Browse files
committed
fix: restore Marquee animation and Tailwind v4 compatibility
1 parent 2f89595 commit ed12d95

File tree

3 files changed

+41
-12
lines changed

3 files changed

+41
-12
lines changed

apps/ui-layout/app/globals.css

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
@import "./token.css";
33
@import "./code-hike.css";
44

5+
@source './pages/**/*.{js,ts,jsx,tsx,mdx}';
6+
@source './components/**/*.{js,ts,jsx,tsx,mdx}';
7+
@source './app/**/*.{js,ts,jsx,tsx,mdx}';
8+
@source './content/**/*.{md,mdx}';
9+
@source './registry/**/*.{js,ts,jsx,tsx}';
510
@source '../../../packages/ui/src/**/*.{js,ts,jsx,tsx}';
611
@source '../../../packages/blocks/src/**/*.{js,ts,jsx,tsx}';
712

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

106-
--animate-border: border 4s linear infinite;
107-
--animate-infinite-scroll: infinite-scroll 25s linear infinite;
108-
--animate-marquee: marquee var(--duration) linear infinite;
109-
--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
110-
--animate-marquee-reverse: marquee-reverse var(--duration) linear infinite;
111-
--animate-marquee-vertical-reverse: marquee-vertical-reverse var(--duration) linear infinite;
112111

113112
@keyframes border {
114113
to {
@@ -123,6 +122,16 @@
123122
transform: translateX(-100%);
124123
}
125124
}
125+
}
126+
127+
@theme inline {
128+
--animate-border: border 4s linear infinite;
129+
--animate-infinite-scroll: infinite-scroll 25s linear infinite;
130+
--animate-marquee: marquee var(--duration) linear infinite;
131+
--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
132+
--animate-marquee-reverse: marquee-reverse var(--duration) linear infinite;
133+
--animate-marquee-vertical-reverse: marquee-vertical-reverse var(--duration) linear infinite;
134+
126135
@keyframes marquee {
127136
from {
128137
transform: translateX(0);

apps/ui-layout/components/ui/marquee.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function Marquee({
2323
<div
2424
{...props}
2525
className={cn(
26-
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-[var(--gap)]',
26+
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-(--gap)',
2727
{
2828
'flex-row': !vertical,
2929
'flex-col': vertical,
@@ -36,7 +36,7 @@ export function Marquee({
3636
.map((_, i) => (
3737
<div
3838
key={i}
39-
className={cn('flex shrink-0 justify-around gap-[var(--gap)]', {
39+
className={cn('flex shrink-0 justify-around gap-(--gap)', {
4040
'animate-marquee flex-row': !vertical && !reverse,
4141
'animate-marquee-vertical flex-col': vertical && !reverse,
4242
'animate-marquee-reverse flex-row': !vertical && reverse,

apps/ui-layout/content/components/marquee.mdx

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,13 @@ export const metadata = {
8282
```css global.css
8383
@import "tailwindcss";
8484

85-
@theme {
85+
@theme inline {
86+
--animate-border: border 4s linear infinite;
87+
--animate-infinite-scroll: infinite-scroll 25s linear infinite;
8688
--animate-marquee: marquee var(--duration) linear infinite;
8789
--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
90+
--animate-marquee-reverse: marquee-reverse var(--duration) linear infinite;
91+
--animate-marquee-vertical-reverse: marquee-vertical-reverse var(--duration) linear infinite;
8892

8993
@keyframes marquee {
9094
from {
@@ -102,6 +106,22 @@ export const metadata = {
102106
transform: translateY(calc(-100% - var(--gap)));
103107
}
104108
}
109+
@keyframes marquee-reverse {
110+
from {
111+
transform: translateX(calc(-100% - var(--gap)));
112+
}
113+
to {
114+
transform: translateX(0);
115+
}
116+
}
117+
@keyframes marquee-vertical-reverse {
118+
from {
119+
transform: translateY(calc(-100% - var(--gap)));
120+
}
121+
to {
122+
transform: translateY(0);
123+
}
124+
}
105125
}
106126
```
107127

@@ -131,7 +151,7 @@ export default function Marquee({
131151
<div
132152
{...props}
133153
className={cn(
134-
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-[var(--gap)]',
154+
'group flex overflow-hidden p-2 [--duration:40s] [--gap:1rem] gap-(--gap)',
135155
{
136156
'flex-row': !vertical,
137157
'flex-col': vertical,
@@ -144,7 +164,7 @@ export default function Marquee({
144164
.map((_, i) => (
145165
<div
146166
key={i}
147-
className={cn('flex shrink-0 justify-around gap-[var(--gap)]', {
167+
className={cn('flex shrink-0 justify-around gap-(--gap)', {
148168
'animate-marquee flex-row': !vertical && !reverse,
149169
'animate-marquee-vertical flex-col': vertical && !reverse,
150170
'animate-marquee-reverse flex-row': !vertical && reverse,
@@ -156,7 +176,7 @@ export default function Marquee({
156176
</div>
157177
))}
158178
</div>
159-
);
179+
)
160180
}
161181
```
162182

0 commit comments

Comments
 (0)