Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/components/data-table-toolbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export function DataTableToolbar({ search, filters, extras, className }: DataTab
)}
</Button>

<Sheet open={sheetOpen} onOpenChange={setSheetOpen}>
<Sheet open={sheetOpen} onOpenChange={setSheetOpen} modal={false}>
<SheetContent side="bottom" className="flex max-h-[85svh] flex-col gap-0 p-0">
<VisuallyHidden>
<SheetDescription>{t`Filter options`}</SheetDescription>
Expand Down
6 changes: 4 additions & 2 deletions app/components/select/autocomplete-grouped.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ export function GroupedSelectAutocomplete({
role="combobox"
aria-expanded={open}
disabled={disabled}
className={cn(width, 'justify-between', triggerClassName, className)}>
{selectedOption ? selectedOption.label : placeholder}
className={cn(width, 'justify-between overflow-hidden', triggerClassName, className)}>
<span className="min-w-0 truncate">
{selectedOption ? selectedOption.label : placeholder}
</span>
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/contact-group/create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Page() {
return (
<div className="m-4">
<Row className="mb-4">
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<Card>
<CardHeader>
<CardTitle>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/contact-group/detail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Page() {
return (
<div className="m-4">
<Row className="mb-4">
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<Card>
<CardHeader>
<CardTitle>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/contact/create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Page() {
return (
<div className="m-4">
<Row className="mb-4">
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<Card>
<CardHeader>
<CardTitle>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/contact/detail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Page() {
return (
<div className="m-4">
<Row className="mb-4">
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<Card>
<CardHeader>
<CardTitle>
Expand Down
6 changes: 3 additions & 3 deletions app/routes/profile/setting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ export default function Page() {
return (
<div className="m-4">
<Row className="mb-4">
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<ProfileForm />
</Col>
</Row>

<Row className="mb-4">
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<UserIdentityCard userId={user?.metadata?.name ?? ''} />
</Col>
</Row>

<Row>
<Col span={12} offset={6}>
<Col xs={24} md={{ span: 12, offset: 6 }}>
<PreferencesForm />
</Col>
</Row>
Expand Down
Loading