CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-03 13:30:46 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into view-filters

Browse source
This commit is contained in:
Martin McKeaveney 2020-08-24 10:50:15 +01:00
parent 6ba109222b 443e85d3a6
commit ab5ab97d5e
10 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/builder/src/components/common/DatePicker.svelte
View file

@ -24,7 +24,7 @@
}) })
</script> </script>
<div class="uk-margin"> <div class="bb-margin-m">
<label class="uk-form-label">{label}</label> <label class="uk-form-label">{label}</label>
<div class="uk-form-controls"> <div class="uk-form-controls">
<input <input

2
packages/builder/src/components/database/DataTable/modals/CreateEditRecord.svelte
View file

@ -47,7 +47,7 @@
<ErrorsBox {errors} /> <ErrorsBox {errors} />
<form on:submit|preventDefault class="uk-form-stacked"> <form on:submit|preventDefault class="uk-form-stacked">
{#each modelSchema as [key, meta]} {#each modelSchema as [key, meta]}
<div class="uk-margin"> <div class="bb-margin-xl">
{#if meta.type === 'link'} {#if meta.type === 'link'}
<LinkedRecordSelector <LinkedRecordSelector
bind:linked={record[key]} bind:linked={record[key]}

13
packages/builder/src/components/userInterface/NewScreen.svelte
View file

@ -80,11 +80,11 @@
okText="Create Screen"> okText="Create Screen">
<div data-cy="new-screen-dialog"> <div data-cy="new-screen-dialog">
<div class="uk-margin"> <div class="bb-margin-xl">
<Input label="Name" bind:value={name} /> <Input label="Name" bind:value={name} />
</div> </div>
<div class="uk-margin"> <div class="bb-margin-xl">
<Input <Input
label="Url" label="Url"
error={routeError} error={routeError}
@ -92,7 +92,7 @@
on:change={routeChanged} /> on:change={routeChanged} />
</div> </div>
<div class="uk-margin"> <div class="bb-margin-xl">
<label>Layout Component</label> <label>Layout Component</label>
<Select bind:value={layoutComponent} secondary> <Select bind:value={layoutComponent} secondary>
{#each layoutComponents as { _component, name }} {#each layoutComponents as { _component, name }}
@ -103,10 +103,3 @@
</div> </div>
</ConfirmDialog> </ConfirmDialog>
<style>
.uk-margin {
display: flex;
flex-direction: column;
}
</style>

2
packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte
View file

@ -23,7 +23,7 @@
} }
</script> </script>
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<label class="uk-form-label">Page</label> <label class="uk-form-label">Page</label>
<div class="uk-form-controls"> <div class="uk-form-controls">
<select class="budibase__input" bind:value={pageName}> <select class="budibase__input" bind:value={pageName}>

2
packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
View file

@ -4,7 +4,7 @@
export let value export let value
</script> </script>
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<div class="uk-form-controls"> <div class="uk-form-controls">
<select class="budibase__input" bind:value> <select class="budibase__input" bind:value>
<option value="" /> <option value="" />

6
packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
View file

@ -5,7 +5,7 @@
export let value export let value
</script> </script>
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<div class="uk-form-controls"> <div class="uk-form-controls">
<select class="budibase__input" bind:value={value.model}> <select class="budibase__input" bind:value={value.model}>
{#each $backendUiStore.models as model} {#each $backendUiStore.models as model}
@ -16,10 +16,10 @@
</div> </div>
{#if value.model} {#if value.model}
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<label class="uk-form-label fields">Fields</label> <label class="uk-form-label fields">Fields</label>
{#each Object.keys(value.model.schema) as field} {#each Object.keys(value.model.schema) as field}
<div class="uk-form-controls uk-margin"> <div class="uk-form-controls bb-margin-xl">
<Input bind:value={value[field]} label={field} /> <Input bind:value={value[field]} label={field} />
</div> </div>
{/each} {/each}

6
packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
View file

@ -81,7 +81,7 @@
{/if} {/if}
</header> </header>
{#if selectedTab === 'TEST'} {#if selectedTab === 'TEST'}
<div class="uk-margin config-item"> <div class="bb-margin-m">
{#if testResult} {#if testResult}
<button <button
transition:fade transition:fade
@ -111,12 +111,10 @@
<div class="panel"> <div class="panel">
<div class="panel-body"> <div class="panel-body">
<div class="block-label">Workflow: {workflow.name}</div> <div class="block-label">Workflow: {workflow.name}</div>
<div class="config-item">
<Input label="Name" bind:value={workflow.name} thin />
</div>
<div class="config-item"> <div class="config-item">
<label class="uk-form-label">User Access</label> <label class="uk-form-label">User Access</label>
<div class="access-levels"> <div class="access-levels">
{#each ACCESS_LEVELS as level} {#each ACCESS_LEVELS as level}
<span class="access-level"> <span class="access-level">
<label>{level.name}</label> <label>{level.name}</label>

15
packages/builder/src/global.css
View file

@ -94,4 +94,19 @@ textarea {
.hoverable:hover { .hoverable:hover {
cursor: pointer; cursor: pointer;
}
.bb-margin-m {
margin-bottom: var(--spacing-m);
}
* + .bb-margin-m {
margin-top: var(--spacing-m);
}
.bb-margin-xl {
margin-bottom: var(--spacing-xl);
}
* + .bb-margin-xl {
margin-top: var(--spacing-xl);
} }

1
packages/standard-components/.gitignore vendored
View file

@ -3,3 +3,4 @@ node_modules
yarn.lock yarn.lock
package-lock.json package-lock.json
dist/index.js dist/index.js
dist/index.js.map

2
packages/standard-components/dist/index.js.map vendored
View file

File diff suppressed because one or more lines are too long