From e1c5cae376076864dda46e2e7e2cc8c0f35b5120 Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Thu, 4 Jun 2020 19:27:25 +0100 Subject: [PATCH 1/3] Workflow UI update --- packages/builder/src/budibase.css | 7 +- .../workflow/SetupPanel/SetupPanel.svelte | 158 +++++++++++++----- .../SetupPanel/WorkflowBlockSetup.svelte | 20 ++- .../WorkflowList/CreateWorkflowModal.svelte | 2 +- .../WorkflowList/WorkflowList.svelte | 41 +++-- .../WorkflowPanel/WorkflowPanel.svelte | 11 +- packages/builder/src/global.css | 4 + .../[application]/frontend/_layout.svelte | 38 ----- .../[application]/workflow/_layout.svelte | 19 ++- 9 files changed, 187 insertions(+), 113 deletions(-) diff --git a/packages/builder/src/budibase.css b/packages/builder/src/budibase.css index 910a795cd2..3d880cbfa2 100644 --- a/packages/builder/src/budibase.css +++ b/packages/builder/src/budibase.css @@ -76,15 +76,14 @@ } .budibase__input { - width: 100%; - max-width: 250px; height: 35px; + width: 220px; border-radius: 3px; border: 1px solid var(--grey-dark); text-align: left; color: var(--ink); - font-size: 16px; - padding-left: 5px; + font-size: 14px; + padding-left: 12px; } .uk-text-right { diff --git a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte index 7d681a9ac0..ad35af33b9 100644 --- a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte +++ b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte @@ -60,7 +60,7 @@ {#if !workflowBlock} (selectedTab = 'TEST')}> Test @@ -86,36 +86,42 @@ {#if selectedTab === 'SETUP'} {#if workflowBlock} - +
+ +
{:else if $workflowStore.currentWorkflow} -
- -
- -
- +
+
+
Workflow: {workflow.name}
+
+ +
+ +
+
+
+ +
+ {#each ACCESS_LEVELS as { name, key }} + + + + + {/each} +
-
- -
- {#each ACCESS_LEVELS as { name, key }} - - - - - {/each} -
+
+
- {/if} {/if} @@ -125,53 +131,118 @@ display: flex; flex-direction: column; height: 100%; + justify-content: space-between; } .panel-body { flex: 1; } + .panel { + display: flex; + flex-direction: column; + justify-content: space-between; + } + header { font-size: 20px; - font-weight: bold; + font-weight: 700; display: flex; align-items: center; - margin-bottom: 20px; + margin-bottom: 18px; + color: var(--ink); } .selected { - color: var(--font); + color: var(--ink); + } + + .block-label { + font-weight: 500; + font-size: 14px; + color: var(--ink); + margin: 0px 0px 16px 0px; } .config-item { - padding: 20px; + margin: 0px 0px 4px 0px; + padding: 12px; background: var(--light-grey); } + .budibase_input { + height: 35px; + width: 220px; + border-radius: 3px; + border: 1px solid var(--grey-dark); + text-align: left; + color: var(--ink); + font-size: 14px; + padding-left: 12px; +} + header > span { - color: var(--dark-grey); + color: var(--ink-lighter); margin-right: 20px; } + .form { + margin-top: 12px; + } + label { font-weight: 500; font-size: 14px; - color: var(--font); + color: var(--ink); + } + + .buttons { + position: absolute; + bottom: 10px; + } + + .delete-workflow-button { + cursor: pointer; + border: 1px solid var(--red); + border-radius: 3px; + width: 260px; + padding: 8px 16px; + display: flex; + justify-content: center; + align-items: center; + background: var(--white); + color: var(--red); + font-size: 14px; + font-weight: 500; + transition: all 2ms; + align-self: flex-end; + margin-bottom: 10px; + } + + .delete-workflow-button:hover { + background: var(--red); + border: 1px solid var(--red); + color: var(--white); } .workflow-button { - font-family: Roboto; + cursor: pointer; + border: 1px solid var(--grey-dark); + border-radius: 3px; width: 100%; - border: solid 1px #f2f2f2; - border-radius: 2px; - background: var(--white); - height: 32px; - font-size: 12px; + padding: 8px 16px; + display: flex; + justify-content: center; + align-items: center; + background: white; + color: var(--ink); + font-size: 14px; font-weight: 500; + transition: all 2ms; } .workflow-button:hover { - background: var(--light-grey); + background: var(--grey-light); } .access-level { @@ -183,14 +254,15 @@ .access-level label { font-weight: normal; + color: var(--ink); } .test-result { border: none; width: 100%; - border-radius: 2px; + border-radius: 3px; height: 32px; - font-size: 12px; + font-size: 14px; font-weight: 500; color: var(--white); text-align: center; @@ -198,10 +270,10 @@ } .passed { - background: #84c991; + background: #84C991; } .failed { - background: var(--coral); + background: var(--red); } diff --git a/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte b/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte index 08bf2d72db..1c275c0dff 100644 --- a/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte +++ b/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte @@ -15,12 +15,12 @@ {#each workflowParams as [parameter, type]} -
+
{#if Array.isArray(type)}