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

Merge branch 'spectrum-bbui' into spectrum/kevins-bits-and-bobs

This commit is contained in:
Keviin Åberg Kultalahti 2021-04-23 14:12:20 +02:00
parent eebdbfac36 d3452d18f8
commit 422707c18a
5 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
View File

@ -1,7 +1,7 @@
<script> <script>
import { automationStore } from "builderStore" import { automationStore } from "builderStore"
import { database } from "stores/backend" import { database } from "stores/backend"
import { notifications, Icon, Button, Modal } from "@budibase/bbui" import { notifications, Icon, Button, Modal, Heading } from "@budibase/bbui"
import AutomationBlockSetup from "./AutomationBlockSetup.svelte" import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
import CreateWebookModal from "../Shared/CreateWebhookModal.svelte" import CreateWebookModal from "../Shared/CreateWebhookModal.svelte"
@ -47,7 +47,7 @@
</script> </script>
<div class="title"> <div class="title">
<h1>Setup</h1> <Heading s>Setup</Heading>
<Icon <Icon
l l
disabled={!automationLive} disabled={!automationLive}
@ -89,10 +89,7 @@
align-items: center; align-items: center;
gap: var(--spacing-xs); gap: var(--spacing-xs);
} }
.title h1 { .title :global(h1) {
font-size: var(--font-size-m);
font-weight: 500;
margin: 0;
flex: 1 1 auto; flex: 1 1 auto;
} }

5
packages/builder/src/components/backend/DataTable/Table.svelte
View File

@ -1,10 +1,9 @@
<script> <script>
import { fade } from "svelte/transition" import { fade } from "svelte/transition"
import { goto, params } from "@roxi/routify" import { goto, params } from "@roxi/routify"
import { Table, Modal } from "@budibase/bbui" import { Table, Modal, Heading, notifications } from "@budibase/bbui"
import api from "builderStore/api" import api from "builderStore/api"
import { notifications } from "@budibase/bbui"
import Spinner from "components/common/Spinner.svelte" import Spinner from "components/common/Spinner.svelte"
import DeleteRowsButton from "./buttons/DeleteRowsButton.svelte" import DeleteRowsButton from "./buttons/DeleteRowsButton.svelte"
import CreateEditRow from "./modals/CreateEditRow.svelte" import CreateEditRow from "./modals/CreateEditRow.svelte"
@ -92,7 +91,7 @@
<div> <div>
<div class="table-title"> <div class="table-title">
{#if title} {#if title}
<h1>{title}</h1> <Heading s>{title}</Heading>
{/if} {/if}
{#if loading} {#if loading}
<div transition:fade> <div transition:fade>

4
packages/builder/src/components/integration/QueryParameterBuilder.svelte
View File

@ -31,12 +31,12 @@
<section> <section>
<div class="controls"> <div class="controls">
<Heading>Parameters</Heading> <Heading s>Parameters</Heading>
{#if !bindable} {#if !bindable}
<Button secondary on:click={newQueryParameter}>Add Param</Button> <Button secondary on:click={newQueryParameter}>Add Param</Button>
{/if} {/if}
</div> </div>
<Body small grey> <Body s>
{#if !bindable} {#if !bindable}
Parameters come in two parts: the parameter name, and a default/fallback Parameters come in two parts: the parameter name, and a default/fallback
value. value.

15
packages/builder/src/components/integration/QueryViewer.svelte
View File

@ -112,12 +112,12 @@
<section class="config"> <section class="config">
<Spacer extraLarge /> <Spacer extraLarge />
<Heading>Query {integrationInfo?.friendlyName}</Heading> <Heading m>Query {integrationInfo?.friendlyName}</Heading>
<Spacer extraLarge /> <Spacer extraLarge />
<Divider /> <Divider />
<Spacer extraLarge /> <Spacer extraLarge />
<Heading>Config</Heading> <Heading s>Config</Heading>
<Body small grey>Provide a name for your query and select its function.</Body> <Body s>Provide a name for your query and select its function.</Body>
<Spacer medium /> <Spacer medium />
<div class="config-field"> <div class="config-field">
<Label>Query Name</Label> <Label>Query Name</Label>
@ -147,8 +147,8 @@
<section> <section>
<Spacer extraLarge /> <Spacer extraLarge />
<div class="config"> <div class="config">
<Heading>Fields</Heading> <Heading s>Fields</Heading>
<Body small grey>Fill in the fields specific to this query.</Body> <Body s>Fill in the fields specific to this query.</Body>
<Spacer medium /> <Spacer medium />
<IntegrationQueryEditor <IntegrationQueryEditor
{datasource} {datasource}
@ -161,7 +161,7 @@
<Divider /> <Divider />
<Spacer extraLarge /> <Spacer extraLarge />
<div class="viewer-controls"> <div class="viewer-controls">
<Heading>Results</Heading> <Heading s>Results</Heading>
<div class="button-container"> <div class="button-container">
<Button <Button
secondary secondary
@ -175,7 +175,8 @@
<Button thin secondary on:click={previewQuery}>Run Query</Button> <Button thin secondary on:click={previewQuery}>Run Query</Button>
</div> </div>
</div> </div>
<Body s grey> <Spacer small />
<Body s>
Below, you can preview the results from your query and change the Below, you can preview the results from your query and change the
schema. schema.
</Body> </Body>

10
packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
View File

@ -47,7 +47,7 @@
this={ICONS[datasource.source]} this={ICONS[datasource.source]}
height="26" height="26"
width="26" /> width="26" />
<Heading l>{datasource.name}</Heading> <Heading m>{datasource.name}</Heading>
</header> </header>
<Body small grey lh>{integration.description}</Body> <Body small grey lh>{integration.description}</Body>
<Spacer extraLarge /> <Spacer extraLarge />
@ -55,12 +55,10 @@
<Spacer extraLarge /> <Spacer extraLarge />
<div class="container"> <div class="container">
<div class="config-header"> <div class="config-header">
<Heading>Configuration</Heading> <Heading s>Configuration</Heading>
<Button secondary on:click={saveDatasource}>Save</Button> <Button secondary on:click={saveDatasource}>Save</Button>
</div> </div>
<Body small grey> <Body s>Connect your database to Budibase using the config below.</Body>
Connect your database to Budibase using the config below.
</Body>
<Spacer extraLarge /> <Spacer extraLarge />
<IntegrationConfigForm <IntegrationConfigForm
schema={integration.datasource} schema={integration.datasource}
@ -70,7 +68,7 @@
<Divider /> <Divider />
<Spacer extraLarge /> <Spacer extraLarge />
<div class="query-header"> <div class="query-header">
<Heading>Queries</Heading> <Heading s>Queries</Heading>
<Button secondary on:click={() => $goto('./new')}>Add Query</Button> <Button secondary on:click={() => $goto('./new')}>Add Query</Button>
</div> </div>
<Spacer extraLarge /> <Spacer extraLarge />