Skip to content

feature: media asset card design changes #7858

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
viva-jinyi merged 8 commits into from
Jan 8, 2026
Merged

feature: media asset card design changes #7858

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2cdda8d
feature: media asset card design changes
viva-jinyi Jan 6, 2026
a9af3c4
refactor: bottom component
viva-jinyi Jan 6, 2026
24a6e99
fix: code review
viva-jinyi Jan 7, 2026
c036ce4
chore: code review
viva-jinyi Jan 7, 2026
2085cd3
chore: design QA applied
viva-jinyi Jan 7, 2026
c7295a0
fix: e2e failed
viva-jinyi Jan 8, 2026
8ef671e
fix: delete !important class
viva-jinyi Jan 8, 2026
7d29498
Merge branch 'main' into feat/media-asset-card-tweak
viva-jinyi Jan 8, 2026
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
7 changes: 6 additions & 1 deletion src/components/button/IconGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<div
:class="
cn(
'flex justify-center items-center shrink-0 outline-hidden border-none p-0 rounded-lg bg-secondary-background shadow-sm transition-all duration-200 cursor-pointer'
'flex justify-center items-center shrink-0 outline-hidden border-none p-0 rounded-lg shadow-sm transition-all duration-200 cursor-pointer',
backgroundClass || 'bg-secondary-background'
Copy link
Contributor

@DrJKL DrJKL Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: cn has an implicit "last item takes precedence", so if you put the background in the base classes and follow up with an optional class that class would apply iff it isn't falsy.

Copy link
Member Author

@viva-jinyi viva-jinyi Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix it in other PR

)
"
>
Expand All @@ -12,4 +13,8 @@

<script setup lang="ts">
import { cn } from '@/utils/tailwindUtil'

const { backgroundClass } = defineProps<{
backgroundClass?: string
}>()
</script>
6 changes: 4 additions & 2 deletions src/components/ui/button/button.variants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export const buttonVariants = cva({
'muted-textonly':
'text-muted-foreground bg-transparent hover:bg-secondary-background-hover',
'destructive-textonly':
'text-destructive-background bg-transparent hover:bg-destructive-background/10'
'text-destructive-background bg-transparent hover:bg-destructive-background/10',
'overlay-white': 'bg-white text-gray-600 hover:bg-white/90'
},
size: {
sm: 'h-6 rounded-sm px-2 py-1 text-xs',
Expand All @@ -44,7 +45,8 @@ const variants = [
'destructive',
'textonly',
'muted-textonly',
'destructive-textonly'
'destructive-textonly',
'overlay-white'
] as const satisfies Array<ButtonVariants['variant']>
const sizes = ['sm', 'md', 'lg', 'icon', 'icon-sm'] as const satisfies Array<
ButtonVariants['size']
Expand Down
2 changes: 2 additions & 0 deletions src/locales/en/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,6 +2373,8 @@
"actions": {
"inspect": "Inspect asset",
"more": "More options",
"zoom": "Zoom in",
"moreOptions": "More options",
"seeMoreOutputs": "See more outputs",
"addToWorkflow": "Add to current workflow",
"download": "Download",
Expand Down
29 changes: 0 additions & 29 deletions src/platform/assets/components/Media3DBottom.vue
View file
Open in desktop

This file was deleted.

Loading
Loading