mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-05 23:26:38 +08:00
style(frontend): remove hardcoded text and bg color overrides on components
Remove redundant text/bg style overrides on Button and Badge components in UserDetailSheet and UserFilterBar to allow proper default and destructive theme variants.
This commit is contained in:
@@ -8,7 +8,7 @@ import {Badge} from "@/components/ui/badge"
|
|||||||
import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar"
|
import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar"
|
||||||
import {Sheet, SheetContent, SheetTitle} from "@/components/ui/sheet"
|
import {Sheet, SheetContent, SheetTitle} from "@/components/ui/sheet"
|
||||||
import type {AdminUser} from "@/lib/services/admin"
|
import type {AdminUser} from "@/lib/services/admin"
|
||||||
import {cn, formatDateTime} from "@/lib/utils"
|
import {formatDateTime} from "@/lib/utils"
|
||||||
|
|
||||||
interface UserDetailSheetProps {
|
interface UserDetailSheetProps {
|
||||||
selectedUser: AdminUser | null
|
selectedUser: AdminUser | null
|
||||||
@@ -54,7 +54,7 @@ export function UserDetailSheet({
|
|||||||
UID: {selectedUser.id}
|
UID: {selectedUser.id}
|
||||||
</Badge>
|
</Badge>
|
||||||
{selectedUser.is_admin && (
|
{selectedUser.is_admin && (
|
||||||
<Badge className="h-4.5 px-1.5 text-[9px] uppercase font-medium bg-primary text-primary-foreground">
|
<Badge className="h-4.5 px-1.5 text-[9px] uppercase font-medium">
|
||||||
Admin
|
Admin
|
||||||
</Badge>
|
</Badge>
|
||||||
)}
|
)}
|
||||||
@@ -157,12 +157,7 @@ export function UserDetailSheet({
|
|||||||
<div className="p-4 border-t bg-background/80 backdrop-blur-md shrink-0">
|
<div className="p-4 border-t bg-background/80 backdrop-blur-md shrink-0">
|
||||||
<Button
|
<Button
|
||||||
variant={selectedUser.is_active ? "destructive" : "default"}
|
variant={selectedUser.is_active ? "destructive" : "default"}
|
||||||
className={cn(
|
className="w-full h-9 text-xs font-medium transition-all active:scale-[0.98]"
|
||||||
"w-full h-9 text-xs font-medium transition-all active:scale-[0.98]",
|
|
||||||
selectedUser.is_active
|
|
||||||
? "bg-red-500 hover:bg-red-600 text-white"
|
|
||||||
: "bg-primary text-primary-foreground hover:bg-primary/90"
|
|
||||||
)}
|
|
||||||
onClick={() => onStatusToggle(selectedUser)}
|
onClick={() => onStatusToggle(selectedUser)}
|
||||||
>
|
>
|
||||||
{selectedUser.is_active ? (
|
{selectedUser.is_active ? (
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ export function UserFilterBar() {
|
|||||||
<>
|
<>
|
||||||
<Separator orientation="vertical" className="mx-1" />
|
<Separator orientation="vertical" className="mx-1" />
|
||||||
<Badge
|
<Badge
|
||||||
variant="secondary"
|
variant="default"
|
||||||
className="text-[10px] h-3 px-1 rounded-full bg-primary text-primary-foreground"
|
className="text-[10px] h-3 px-1 rounded-full"
|
||||||
>
|
>
|
||||||
!
|
!
|
||||||
</Badge>
|
</Badge>
|
||||||
@@ -114,8 +114,8 @@ export function UserFilterBar() {
|
|||||||
<>
|
<>
|
||||||
<Separator orientation="vertical" className="mx-1" />
|
<Separator orientation="vertical" className="mx-1" />
|
||||||
<Badge
|
<Badge
|
||||||
variant="secondary"
|
variant="default"
|
||||||
className="text-[10px] h-3 px-1 rounded-full bg-primary text-primary-foreground"
|
className="text-[10px] h-3 px-1 rounded-full"
|
||||||
>
|
>
|
||||||
1
|
1
|
||||||
</Badge>
|
</Badge>
|
||||||
|
|||||||
Reference in New Issue
Block a user