diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml index 1626d520b6..9e0ede07bf 100644 --- a/hosting/docker-compose.dev.yaml +++ b/hosting/docker-compose.dev.yaml @@ -6,7 +6,7 @@ services: minio-service: container_name: budi-minio-dev restart: on-failure - image: minio/minio + image: minio/minio:RELEASE.2022-10-24T18-35-07Z volumes: - minio_data:/data ports: diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index 5215a7ed8e..19d361c8b1 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -33,6 +33,7 @@ export let allowSelectRows export let allowEditRows = true export let allowEditColumns = true + export let allowClickRows = true export let selectedRows = [] export let customRenderers = [] export let disableSorting = false @@ -373,7 +374,7 @@ {/if} {#if sortedRows?.length} {#each sortedRows as row, idx} -
+
{#if showEditColumn}
{/if} -
- {usage.name} -
+ + + {usage.name} + +
- {#if unlimited} - {usage.used} / Unlimited - {:else} - {usage.used} / {usage.total} - {/if} + + + {#if unlimited} + {usage.used} / Unlimited + {:else} + {usage.used} / {usage.total} + {/if} + +
{#if unlimited} @@ -89,13 +95,14 @@ display: flex; flex-direction: row; justify-content: space-between; + align-items: flex-end; margin-bottom: 12px; + gap: var(--spacing-m); } .header-container { display: flex; } - .heading { - margin-top: 3px; - margin-left: 5px; + .nowrap { + white-space: nowrap; } diff --git a/packages/builder/src/pages/builder/portal/_components/Logo.svelte b/packages/builder/src/pages/builder/portal/_components/Logo.svelte index 8276510201..811e4a162a 100644 --- a/packages/builder/src/pages/builder/portal/_components/Logo.svelte +++ b/packages/builder/src/pages/builder/portal/_components/Logo.svelte @@ -1,9 +1,14 @@ -Budibase Logo $goto("./apps")} /> +Budibase Logo $goto("./apps")} +/> diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte index 37143e25c1..b3aed56a48 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte @@ -144,7 +144,7 @@ addData(data)} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte index 43eea4aaa6..62c5da12ec 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte @@ -192,7 +192,7 @@
Users - +
{/if} - {#if $usersFetch.loaded && $licensing.groupsEnabled && appGroups.length} + {#if $usersFetch.loaded && $licensing.groupsEnabled}
Groups - +
import { - ActionButton, Button, DatePicker, Divider, @@ -246,9 +245,7 @@ />
- - Create new backup - +
diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte index 6e25944742..e39365710b 100644 --- a/packages/builder/src/pages/builder/portal/plugins/index.svelte +++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte @@ -103,6 +103,7 @@ allowEditColumns={false} allowEditRows={false} allowSelectRows={false} + allowClickRows={false} {customRenderers} /> diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index 859e266ef0..ee584dd71b 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -250,7 +250,7 @@ flex-direction: row; justify-content: flex-start; align-items: center; - gap: var(--spacing-m); + gap: var(--spacing-l); } .header :global(.spectrum-Heading) { flex: 1 1 auto; diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index 9498472f66..26a1d25f44 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -389,6 +389,7 @@ display: flex; align-items: center; justify-content: flex-start; + gap: var(--spacing-l); } .tableTitle { display: flex; @@ -396,7 +397,6 @@ align-items: flex-end; } .subtitle { - padding: 0 0 0 var(--spacing-m); display: flex; flex-direction: column; justify-content: center;