Merge branch 'spectrum-bbui' into spectrum/kevs-bits-and-bobs-the-sequel
This commit is contained in:
commit
f5272b64b7
|
@ -141,15 +141,15 @@
|
|||
li {
|
||||
display: flex;
|
||||
font-family: var(--font-sans);
|
||||
font-size: var(--font-size-xs);
|
||||
font-size: var(--font-size-s);
|
||||
color: var(--grey-7);
|
||||
padding: var(--spacing-m);
|
||||
margin: auto 0px;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
border-radius: var(--spacing-s);
|
||||
border: var(--border-light);
|
||||
border-top: var(--border-light);
|
||||
border-width: 1px 0 1px 0;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
pre,
|
||||
|
|
|
@ -1,27 +1,23 @@
|
|||
<script>
|
||||
import { Icon, Label, Popover } from "@budibase/bbui"
|
||||
import { Icon, Label, Modal, ModalContent } from "@budibase/bbui"
|
||||
import ThemeEditor from "./ThemeEditor.svelte"
|
||||
|
||||
let anchor
|
||||
let popover
|
||||
let modal
|
||||
</script>
|
||||
|
||||
<div class="topnavitemright" on:click={popover.show} bind:this={anchor}>
|
||||
<div class="topnavitemright" on:click={modal.show}>
|
||||
<Icon hoverable name="ColorFill" />
|
||||
</div>
|
||||
<div class="dropdown">
|
||||
<Popover bind:this={popover} {anchor} align="right">
|
||||
<div class="content">
|
||||
<Label extraSmall grey>Theme</Label>
|
||||
<Modal bind:this={modal}>
|
||||
<ModalContent
|
||||
title="Builder Theme"
|
||||
confirmText="Done"
|
||||
showCancelButton={false}>
|
||||
<ThemeEditor />
|
||||
</div>
|
||||
</Popover>
|
||||
</div>
|
||||
</ModalContent>
|
||||
</Modal>
|
||||
|
||||
<style>
|
||||
.dropdown {
|
||||
z-index: 2;
|
||||
}
|
||||
.topnavitemright {
|
||||
cursor: pointer;
|
||||
color: var(--grey-7);
|
||||
|
@ -35,7 +31,4 @@
|
|||
height: 24px;
|
||||
width: 24px;
|
||||
}
|
||||
.content {
|
||||
padding: var(--spacing-xl);
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -162,14 +162,14 @@
|
|||
<Button medium secondary on:click={() => $currentStep--}>Back</Button>
|
||||
{/if}
|
||||
{#if $currentStep < steps.length - 1}
|
||||
<Button medium blue on:click={() => $currentStep++} disabled={!valid}>
|
||||
<Button medium cta on:click={() => $currentStep++} disabled={!valid}>
|
||||
Next
|
||||
</Button>
|
||||
{/if}
|
||||
{#if $currentStep === steps.length - 1}
|
||||
<Button
|
||||
medium
|
||||
blue
|
||||
cta
|
||||
on:click={createNewApp}
|
||||
disabled={!valid || submitting}>
|
||||
{submitting ? 'Loading...' : 'Submit'}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
let selected = $isActive("./datasource") ? "External" : "Internal"
|
||||
|
||||
function selectFirstTableOrSource({ detail }) {
|
||||
const { key } = tabs.find((t) => t.title === detail)
|
||||
const { key } = tabs.find(t => t.title === detail)
|
||||
if (key === "datasource") {
|
||||
$goto("./datasource")
|
||||
} else {
|
||||
|
@ -54,8 +54,7 @@
|
|||
</Tabs>
|
||||
<div
|
||||
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} />
|
||||
</div>
|
||||
</div>
|
||||
|
@ -82,6 +81,10 @@
|
|||
align-items: stretch;
|
||||
gap: var(--spacing-l);
|
||||
}
|
||||
.content :global(> span) {
|
||||
display: contents;
|
||||
}
|
||||
|
||||
.tab-content-padding {
|
||||
padding: 0 var(--spacing-xl);
|
||||
}
|
||||
|
|
|
@ -101,8 +101,8 @@
|
|||
}
|
||||
},
|
||||
"stackedlist": {
|
||||
"name": "TaskList",
|
||||
"icon": "ri-archive-drawer-line",
|
||||
"name": "Stacked List",
|
||||
"icon": "TaskList",
|
||||
"description": "A basic card component that can contain content and actions.",
|
||||
"styleable": true,
|
||||
"settings": [
|
||||
|
|
Loading…
Reference in New Issue