Merge branch 'spectrum-bbui' into spectrum/kevs-bits-and-bobs-the-sequel

This commit is contained in:
Keviin Åberg Kultalahti 2021-04-28 15:55:15 +02:00
commit f5272b64b7
5 changed files with 24 additions and 28 deletions

View File

@ -141,15 +141,15 @@
li { li {
display: flex; display: flex;
font-family: var(--font-sans); font-family: var(--font-sans);
font-size: var(--font-size-xs); font-size: var(--font-size-s);
color: var(--grey-7); color: var(--grey-7);
padding: var(--spacing-m); padding: var(--spacing-m);
margin: auto 0px; margin: auto 0px;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
border-radius: var(--spacing-s); border-top: var(--border-light);
border: var(--border-light);
border-width: 1px 0 1px 0; border-width: 1px 0 1px 0;
border-radius: 4px;
} }
pre, pre,

View File

@ -1,27 +1,23 @@
<script> <script>
import { Icon, Label, Popover } from "@budibase/bbui" import { Icon, Label, Modal, ModalContent } from "@budibase/bbui"
import ThemeEditor from "./ThemeEditor.svelte" import ThemeEditor from "./ThemeEditor.svelte"
let anchor let modal
let popover
</script> </script>
<div class="topnavitemright" on:click={popover.show} bind:this={anchor}> <div class="topnavitemright" on:click={modal.show}>
<Icon hoverable name="ColorFill" /> <Icon hoverable name="ColorFill" />
</div> </div>
<div class="dropdown"> <Modal bind:this={modal}>
<Popover bind:this={popover} {anchor} align="right"> <ModalContent
<div class="content"> title="Builder Theme"
<Label extraSmall grey>Theme</Label> confirmText="Done"
<ThemeEditor /> showCancelButton={false}>
</div> <ThemeEditor />
</Popover> </ModalContent>
</div> </Modal>
<style> <style>
.dropdown {
z-index: 2;
}
.topnavitemright { .topnavitemright {
cursor: pointer; cursor: pointer;
color: var(--grey-7); color: var(--grey-7);
@ -35,7 +31,4 @@
height: 24px; height: 24px;
width: 24px; width: 24px;
} }
.content {
padding: var(--spacing-xl);
}
</style> </style>

View File

@ -162,14 +162,14 @@
<Button medium secondary on:click={() => $currentStep--}>Back</Button> <Button medium secondary on:click={() => $currentStep--}>Back</Button>
{/if} {/if}
{#if $currentStep < steps.length - 1} {#if $currentStep < steps.length - 1}
<Button medium blue on:click={() => $currentStep++} disabled={!valid}> <Button medium cta on:click={() => $currentStep++} disabled={!valid}>
Next Next
</Button> </Button>
{/if} {/if}
{#if $currentStep === steps.length - 1} {#if $currentStep === steps.length - 1}
<Button <Button
medium medium
blue cta
on:click={createNewApp} on:click={createNewApp}
disabled={!valid || submitting}> disabled={!valid || submitting}>
{submitting ? 'Loading...' : 'Submit'} {submitting ? 'Loading...' : 'Submit'}

View File

@ -20,7 +20,7 @@
let selected = $isActive("./datasource") ? "External" : "Internal" let selected = $isActive("./datasource") ? "External" : "Internal"
function selectFirstTableOrSource({ detail }) { function selectFirstTableOrSource({ detail }) {
const { key } = tabs.find((t) => t.title === detail) const { key } = tabs.find(t => t.title === detail)
if (key === "datasource") { if (key === "datasource") {
$goto("./datasource") $goto("./datasource")
} else { } else {
@ -54,8 +54,7 @@
</Tabs> </Tabs>
<div <div
class="add-button" class="add-button"
data-cy={`new-${selected === "External" ? "datasource" : "tabel"}`} data-cy={`new-${selected === 'External' ? 'datasource' : 'tabel'}`}>
>
<Icon hoverable name="AddCircle" on:click={modal.show} /> <Icon hoverable name="AddCircle" on:click={modal.show} />
</div> </div>
</div> </div>
@ -82,6 +81,10 @@
align-items: stretch; align-items: stretch;
gap: var(--spacing-l); gap: var(--spacing-l);
} }
.content :global(> span) {
display: contents;
}
.tab-content-padding { .tab-content-padding {
padding: 0 var(--spacing-xl); padding: 0 var(--spacing-xl);
} }

View File

@ -101,8 +101,8 @@
} }
}, },
"stackedlist": { "stackedlist": {
"name": "TaskList", "name": "Stacked List",
"icon": "ri-archive-drawer-line", "icon": "TaskList",
"description": "A basic card component that can contain content and actions.", "description": "A basic card component that can contain content and actions.",
"styleable": true, "styleable": true,
"settings": [ "settings": [