Skip to content

Commit 0525b74

Browse files
committed
ui
1 parent 79aaeda commit 0525b74

File tree

11 files changed

+22
-23
lines changed

11 files changed

+22
-23
lines changed

frontend/src/modules/attachment/table/attachments-table.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import type { RowsChangeData } from '~/modules/common/data-grid';
1414
import { DataTable } from '~/modules/common/data-table/data-table';
1515
import { useSortColumns } from '~/modules/common/data-table/sort-columns';
1616
import type { ColumnOrColumnGroup } from '~/modules/common/data-table/types';
17-
import { FocusViewContainer } from '~/modules/common/focus-view';
1817
import type { EnrichedContextEntity } from '~/modules/entities/types';
1918

2019
const LIMIT = appConfig.requestLimits.attachments;
@@ -123,7 +122,7 @@ function AttachmentsTable({ contextEntity, canUpload = true, isSheet = false }:
123122
const clearSelection = () => setSelected([]);
124123

125124
return (
126-
<FocusViewContainer data-is-compact={isCompact}>
125+
<>
127126
<AttachmentsTableBar
128127
contextEntity={contextEntity}
129128
selected={selected}
@@ -160,7 +159,7 @@ function AttachmentsTable({ contextEntity, canUpload = true, isSheet = false }:
160159
NoRowsComponent,
161160
}}
162161
/>
163-
</FocusViewContainer>
162+
</>
164163
);
165164
}
166165

frontend/src/modules/common/down-alert.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ const downAlertConfig = {
2828
className="max-sm:hidden"
2929
i18nKey={i18nKey}
3030
components={{
31-
site_anchor: <button type="button" className="underline" onClick={dismissAlert} />,
32-
retry_anchor: <button type="button" className="underline" onClick={retry} />,
31+
site_anchor: (
32+
<button type="button" className="underline font-semibold underline-offset-2" onClick={dismissAlert} />
33+
),
34+
retry_anchor: (
35+
<button type="button" className="underline font-semibold underline-offset-2" onClick={retry} />
36+
),
3337
}}
3438
/>
3539
);

frontend/src/modules/common/uploader/uploader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const Uploader = () => {
2525
if (!open) remove();
2626
}}
2727
>
28-
<DialogContent className="w-[70vw] h-[40vh] min-h-fit md:max-w-xl">
28+
<DialogContent className="w-[90vw] xs:w-[80vw] max-w-xl h-[40vh] min-h-fit md:max-w-2xl">
2929
<DialogHeader className="with-close-btn">
3030
<DialogTitle className={`${uploaderData.title ? '' : 'hidden'} leading-6 h-6`}>
3131
{uploaderData.title}

frontend/src/modules/memberships/members-table/members-table.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { ContentPlaceholder } from '~/modules/common/content-placeholder';
88
import type { RowsChangeData } from '~/modules/common/data-grid';
99
import { DataTable } from '~/modules/common/data-table/data-table';
1010
import { useSortColumns } from '~/modules/common/data-table/sort-columns';
11-
import { FocusViewContainer } from '~/modules/common/focus-view';
1211
import type { EnrichedContextEntity } from '~/modules/entities/types';
1312
import { MembersTableBar } from '~/modules/memberships/members-table/members-bar';
1413
import { useColumns } from '~/modules/memberships/members-table/members-columns';
@@ -106,7 +105,7 @@ function MembersTable({ contextEntity, isSheet = false, children }: MembersTable
106105
const visibleColumns = useMemo(() => columns.filter((column) => !column.hidden), [columns]);
107106

108107
return (
109-
<FocusViewContainer disabled={isSheet}>
108+
<>
110109
<MembersTableBar
111110
contextEntity={contextEntity}
112111
selected={selected}
@@ -147,7 +146,7 @@ function MembersTable({ contextEntity, isSheet = false, children }: MembersTable
147146
),
148147
}}
149148
/>
150-
</FocusViewContainer>
149+
</>
151150
);
152151
}
153152

frontend/src/modules/navigation/floating-nav/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const FloatingNavButton = ({
4242
variant="secondary"
4343
onClick={onClick}
4444
className={cn(
45-
`fixed z-105 w-14 h-14 flex items-center shadow-lg bg-secondary hover:bg-secondary justify-center rounded-full bottom-4
45+
`fixed z-105 w-14 h-14 flex items-center shadow-xl bg-secondary hover:bg-secondary justify-center rounded-full bottom-4
4646
transition-all duration-300 ease-in-out transform opacity-100 active:scale-95
4747
data-[direction=left]:left-4 data-[direction=right]:right-4`,
4848
className,

frontend/src/modules/organization/table/organizations-table.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { ContentPlaceholder } from '~/modules/common/content-placeholder';
88
import type { RowsChangeData } from '~/modules/common/data-grid';
99
import { DataTable } from '~/modules/common/data-table/data-table';
1010
import { useSortColumns } from '~/modules/common/data-table/sort-columns';
11-
import { FocusViewContainer } from '~/modules/common/focus-view';
1211
import { useChangeEntityRoleMutation } from '~/modules/memberships/query-mutations';
1312
import { organizationsListQueryOptions } from '~/modules/organization/query';
1413
import { OrganizationsTableBar } from '~/modules/organization/table/organizations-bar';
@@ -83,7 +82,7 @@ function OrganizationsTable() {
8382
const visibleColumns = useMemo(() => columns.filter((column) => !column.hidden), [columns]);
8483

8584
return (
86-
<FocusViewContainer data-is-compact={isCompact}>
85+
<>
8786
<OrganizationsTableBar
8887
queryKey={queryOptions.queryKey}
8988
selected={selected}
@@ -123,7 +122,7 @@ function OrganizationsTable() {
123122
),
124123
}}
125124
/>
126-
</FocusViewContainer>
125+
</>
127126
);
128127
}
129128

frontend/src/modules/page/table/pages-table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function PagesTable() {
141141
);
142142

143143
return (
144-
<FocusViewContainer data-is-compact={isCompact}>
144+
<FocusViewContainer>
145145
<PagesTableBar
146146
searchVars={{ ...search, limit }}
147147
setSearch={setSearch}

frontend/src/modules/requests/table/requests-table.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { useSearchParams } from '~/hooks/use-search-params';
88
import { ContentPlaceholder } from '~/modules/common/content-placeholder';
99
import { DataTable } from '~/modules/common/data-table/data-table';
1010
import { useSortColumns } from '~/modules/common/data-table/sort-columns';
11-
import { FocusViewContainer } from '~/modules/common/focus-view';
1211
import { requestsListQueryOptions } from '~/modules/requests/query';
1312
import { RequestsTableBar } from '~/modules/requests/table/requests-bar';
1413
import { useColumns } from '~/modules/requests/table/requests-columns';
@@ -62,7 +61,7 @@ function RequestsTable() {
6261
const visibleColumns = useMemo(() => columns.filter((column) => !column.hidden), [columns]);
6362

6463
return (
65-
<FocusViewContainer>
64+
<>
6665
<RequestsTableBar
6766
queryKey={queryOptions.queryKey}
6867
selected={selected}
@@ -99,7 +98,7 @@ function RequestsTable() {
9998
),
10099
}}
101100
/>
102-
</FocusViewContainer>
101+
</>
103102
);
104103
}
105104

frontend/src/modules/tenants/table/tenants-table.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { ContentPlaceholder } from '~/modules/common/content-placeholder';
99
import type { RowsChangeData } from '~/modules/common/data-grid';
1010
import { DataTable } from '~/modules/common/data-table/data-table';
1111
import { useSortColumns } from '~/modules/common/data-table/sort-columns';
12-
import { FocusViewContainer } from '~/modules/common/focus-view';
1312
import { tenantsListQueryOptions, useTenantUpdateMutation } from '~/modules/tenants/query';
1413
import type { TenantsRouteSearchParams } from '~/modules/tenants/search-params-schema';
1514
import { TenantsTableBar } from '~/modules/tenants/table/tenants-bar';
@@ -68,7 +67,7 @@ function TenantsTable() {
6867
const visibleColumns = useMemo(() => columns.filter((column) => !column.hidden), [columns]);
6968

7069
return (
71-
<FocusViewContainer>
70+
<>
7271
<TenantsTableBar
7372
queryKey={queryOptions.queryKey}
7473
columns={columns}
@@ -102,7 +101,7 @@ function TenantsTable() {
102101
),
103102
}}
104103
/>
105-
</FocusViewContainer>
104+
</>
106105
);
107106
}
108107

frontend/src/modules/user/table/users-table.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { appConfig } from 'shared';
44
import { useSearchParams } from '~/hooks/use-search-params';
55
import { DataTable } from '~/modules/common/data-table/data-table';
66
import { useSortColumns } from '~/modules/common/data-table/sort-columns';
7-
import { FocusViewContainer } from '~/modules/common/focus-view';
87
import { usersListQueryOptions } from '~/modules/user/query';
98
import { UsersTableBar } from '~/modules/user/table/users-bar';
109
import { useColumns } from '~/modules/user/table/users-columns';
@@ -57,7 +56,7 @@ function UsersTable() {
5756
const visibleColumns = useMemo(() => columns.filter((column) => !column.hidden), [columns]);
5857

5958
return (
60-
<FocusViewContainer>
59+
<>
6160
<UsersTableBar
6261
queryKey={queryOptions.queryKey}
6362
selected={selected}
@@ -87,7 +86,7 @@ function UsersTable() {
8786
onSortColumnsChange,
8887
}}
8988
/>
90-
</FocusViewContainer>
89+
</>
9190
);
9291
}
9392

0 commit comments

Comments
 (0)