This commit is contained in:
miloschwartz
2025-11-07 20:38:36 -08:00
parent fb9ed8f592
commit 7125b49024
5 changed files with 16 additions and 16 deletions

View File

@@ -20,11 +20,11 @@ export function LayoutHeader({ showTopBar }: LayoutHeaderProps) {
const { isUnlocked } = useLicenseStatusContext(); const { isUnlocked } = useLicenseStatusContext();
const logoWidth = isUnlocked() const logoWidth = isUnlocked()
? env.branding.logo?.navbar?.width || 98 ? env.branding.logo?.navbar?.width || 118
: 98; : 118;
const logoHeight = isUnlocked() const logoHeight = isUnlocked()
? env.branding.logo?.navbar?.height || 32 ? env.branding.logo?.navbar?.height || 29.5
: 32; : 29.5;
useEffect(() => { useEffect(() => {
function getPath() { function getPath() {

View File

@@ -49,7 +49,7 @@ export function OrgSelector({ orgId, orgs, isCollapsed = false }: OrgSelectorPro
<Popover open={open} onOpenChange={setOpen}> <Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild> <PopoverTrigger asChild>
<Button <Button
variant="secondary" variant="outline"
size={isCollapsed ? "icon" : "lg"} size={isCollapsed ? "icon" : "lg"}
role="combobox" role="combobox"
aria-expanded={open} aria-expanded={open}
@@ -62,7 +62,7 @@ export function OrgSelector({ orgId, orgs, isCollapsed = false }: OrgSelectorPro
) : ( ) : (
<div className="flex items-center justify-between w-full min-w-0"> <div className="flex items-center justify-between w-full min-w-0">
<div className="flex items-center min-w-0 flex-1"> <div className="flex items-center min-w-0 flex-1">
<Building2 className="h-4 w-4 mr-2 shrink-0" /> <Building2 className="h-4 w-4 mr-3 shrink-0" />
<div className="flex flex-col items-start min-w-0 flex-1"> <div className="flex flex-col items-start min-w-0 flex-1">
<span className="font-bold text-sm"> <span className="font-bold text-sm">
{t('org')} {t('org')}

View File

@@ -241,7 +241,7 @@ export default function VerifyEmailForm({
<Button <Button
type="button" type="button"
variant={"secondary"} variant={"outline"}
className="w-full" className="w-full"
onClick={logout} onClick={logout}
> >

View File

@@ -195,8 +195,8 @@ export function DataTable<TData, TValue>({
// Auto-enable persistence if column visibility is enabled // Auto-enable persistence if column visibility is enabled
// Use explicit persistColumnVisibility if provided, otherwise auto-enable when enableColumnVisibility is true and we have a tableId // Use explicit persistColumnVisibility if provided, otherwise auto-enable when enableColumnVisibility is true and we have a tableId
const shouldPersistColumnVisibility = const shouldPersistColumnVisibility =
persistColumnVisibility === true || persistColumnVisibility === true ||
typeof persistColumnVisibility === "string" || typeof persistColumnVisibility === "string" ||
(enableColumnVisibility && tableId !== undefined); (enableColumnVisibility && tableId !== undefined);
@@ -320,10 +320,10 @@ export function DataTable<TData, TValue>({
// Get sticky column classes // Get sticky column classes
const getStickyClasses = (columnId: string | undefined, accessorKey: string | undefined): string => { const getStickyClasses = (columnId: string | undefined, accessorKey: string | undefined): string => {
if (isStickyColumn(columnId, accessorKey, "left")) { if (isStickyColumn(columnId, accessorKey, "left")) {
return "md:sticky md:left-0 z-10 bg-card"; return "md:sticky md:left-0 z-10 bg-card [mask-image:linear-gradient(to_left,transparent_0%,black_20px)]";
} }
if (isStickyColumn(columnId, accessorKey, "right")) { if (isStickyColumn(columnId, accessorKey, "right")) {
return "sticky right-0 z-10 w-auto min-w-fit bg-card"; return "sticky right-0 z-10 w-auto min-w-fit bg-card [mask-image:linear-gradient(to_right,transparent_0%,black_20px)]";
} }
return ""; return "";
}; };
@@ -406,7 +406,7 @@ export function DataTable<TData, TValue>({
const isRightSticky = isStickyColumn(columnId, accessorKey, "right"); const isRightSticky = isStickyColumn(columnId, accessorKey, "right");
const hasHideableColumns = enableColumnVisibility && const hasHideableColumns = enableColumnVisibility &&
table.getAllColumns().some((col) => col.getCanHide()); table.getAllColumns().some((col) => col.getCanHide());
return ( return (
<TableHead <TableHead
key={header.id} key={header.id}
@@ -435,9 +435,9 @@ export function DataTable<TData, TValue>({
.map((column) => { .map((column) => {
const columnDef = column.columnDef as any; const columnDef = column.columnDef as any;
const friendlyName = columnDef.friendlyName; const friendlyName = columnDef.friendlyName;
const displayName = friendlyName || const displayName = friendlyName ||
(typeof columnDef.header === "string" (typeof columnDef.header === "string"
? columnDef.header ? columnDef.header
: column.id); : column.id);
return ( return (
<DropdownMenuCheckboxItem <DropdownMenuCheckboxItem

View File

@@ -38,7 +38,7 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content <DialogPrimitive.Content
ref={ref} ref={ref}
className={cn( className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 bg-card p-6 duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:scale-95 data-[state=open]:scale-100 sm:rounded-lg", "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-card p-6 duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:scale-95 data-[state=open]:scale-100 sm:rounded-lg",
className className
)} )}
{...props} {...props}