MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:budibase/budibase into enforce-example-com-emails-in-tests

This commit is contained in:
Sam Rose 2024-02-21 14:38:33 +00:00
parent 90dd267aaf f417c2d8a4
commit c8567a5c47
No known key found for this signature in database
9 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/bbui/src/Layout/Page.svelte
View File

@ -43,6 +43,7 @@
flex-direction: row;
justify-content: flex-start;
align-items: stretch;
overflow-y: scroll !important;
flex: 1 1 auto;
overflow-x: hidden;
}

6
packages/bbui/src/Typography/Body.svelte
View File

@ -20,3 +20,9 @@
>
<slot />
</p>
<style>
p {
text-wrap: pretty;
}
</style>

4
packages/bbui/src/Typography/Heading.svelte
View File

@ -21,4 +21,8 @@
h1 {
font-family: var(--font-accent);
}
h1 {
text-wrap: balance;
}
</style>

1
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
View File

@ -130,6 +130,7 @@
flex-grow: 1;
padding: 23px 23px 80px;
box-sizing: border-box;
overflow-x: hidden;
}
.header.scrolling {

2
packages/builder/src/pages/builder/app/[application]/data/new.svelte
View File

@ -77,7 +77,7 @@
</DatasourceOption>
<DatasourceOption
on:click={() => internalTableModal.show({ promptUpload: true })}
title="Upload data"
title="Upload CSV / JSON"
description="Non-relational"
{disabled}
>

4
packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
View File

@ -10,7 +10,7 @@
{#if $admin.cloud && $auth?.user?.accountPortalAccess}
<Button
cta
size="S"
size="M"
on:click
on:click={() => {
window.open($admin.accountPortalUrl + "/portal/upgrade", "_blank")
@ -21,7 +21,7 @@
{:else if !$admin.cloud && sdk.users.isAdmin($auth.user)}
<Button
cta
size="S"
size="M"
on:click={() => $goto("/builder/portal/account/upgrade")}
on:click
>

9
packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
View File

@ -49,10 +49,13 @@
{#if sdk.users.isAdmin($auth.user) && diagnosticInfo}
<Layout noPadding>
<Layout gap="XS">
<Layout gap="XS" noPadding>
<Heading size="M">Diagnostics</Heading>
Please include this diagnostic information in support requests and github issues
by clicking the button on the top right to copy to clipboard.
<Body>
Please include this diagnostic information in support requests and
github issues by clicking the button on the top right to copy to
clipboard.
</Body>
<Divider />
<Body size="M">
<section>

26
packages/client/manifest.json
View File

@ -89,13 +89,13 @@
{
"label": "Column",
"value": "column",
"barIcon": "ViewColumn",
"barIcon": "TableSelectColumn",
"barTitle": "Column layout"
},
{
"label": "Row",
"value": "row",
"barIcon": "ViewRow",
"barIcon": "TableSelectRow",
"barTitle": "Row layout"
}
],
@ -298,13 +298,13 @@
{
"label": "Column",
"value": "column",
"barIcon": "ViewColumn",
"barIcon": "TableSelectColumn",
"barTitle": "Column layout"
},
{
"label": "Row",
"value": "row",
"barIcon": "ViewRow",
"barIcon": "TableSelectRow",
"barTitle": "Row layout"
}
],
@ -460,6 +460,10 @@
"label": "Variant",
"key": "type",
"options": [
{
"label": "Action",
"value": "cta"
},
{
"label": "Primary",
"value": "primary"
@ -468,10 +472,6 @@
"label": "Secondary",
"value": "secondary"
},
{
"label": "Action",
"value": "cta"
},
{
"label": "Warning",
"value": "warning"
@ -481,7 +481,7 @@
"value": "overBackground"
}
],
"defaultValue": "primary"
"defaultValue": "cta"
},
{
"type": "select",
@ -602,13 +602,13 @@
{
"label": "Column",
"value": "column",
"barIcon": "ViewColumn",
"barIcon": "TableSelectColumn",
"barTitle": "Column layout"
},
{
"label": "Row",
"value": "row",
"barIcon": "ViewRow",
"barIcon": "TableSelectRow",
"barTitle": "Row layout"
}
],
@ -5917,13 +5917,13 @@
{
"label": "Column",
"value": "column",
"barIcon": "ViewRow",
"barIcon": "TableSelectColumn",
"barTitle": "Column layout"
},
{
"label": "Row",
"value": "row",
"barIcon": "ViewColumn",
"barIcon": "TableSelectRow",
"barTitle": "Row layout"
}
],

2
packages/client/src/components/app/Button.svelte
View File

@ -11,7 +11,7 @@
export let text = ""
export let onClick
export let size = "M"
export let type = "primary"
export let type = "cta"
export let quiet = false
// For internal use only for now - not defined in the manifest