From 7c98a466e45a79c3fb8e87d154e31088c28f0329 Mon Sep 17 00:00:00 2001
From: Joe <49767913+joebudi@users.noreply.github.com>
Date: Thu, 25 Jun 2020 15:49:56 +0100
Subject: [PATCH] General UI fixing previous styling issues
---
packages/builder/package.json | 2 +-
packages/builder/src/budibase.css | 11 +-
.../src/components/common/Block.svelte | 8 +-
.../src/components/common/NumberBox.svelte | 8 +-
.../src/components/common/ValuesList.svelte | 25 +-
.../ModelDataTable/ModelDataTable.svelte | 5 -
.../modals/CreateEditRecord.svelte | 27 ++-
.../nav/ModelNavigator/BlockNavigator.svelte | 3 +-
.../nav/ModelNavigator/ListItem.svelte | 11 +-
.../nav/ModelNavigator/ModelNavigator.svelte | 2 +-
.../nav/ModelSetupNav/ModelFieldEditor.svelte | 26 ++-
.../nav/ModelSetupNav/ModelSetupNav.svelte | 11 +-
.../userInterface/UserInterfaceRoot.svelte | 2 +-
.../[application]/backend/_layout.svelte | 2 +-
.../[application]/workflow/_layout.svelte | 1 +
packages/server/yarn.lock | 221 +-----------------
16 files changed, 97 insertions(+), 268 deletions(-)
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f6109b0c05..26d6ee3e61 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -50,7 +50,7 @@
]
},
"dependencies": {
- "@budibase/bbui": "^1.10.2",
+ "@budibase/bbui": "^1.13.0",
"@budibase/client": "^0.0.32",
"@nx-js/compiler-util": "^2.0.0",
"codemirror": "^5.51.0",
diff --git a/packages/builder/src/budibase.css b/packages/builder/src/budibase.css
index 134ec5a6a9..eed164131d 100644
--- a/packages/builder/src/budibase.css
+++ b/packages/builder/src/budibase.css
@@ -78,12 +78,17 @@
.budibase__input {
height: 36px;
- width: 220px;
- border-radius: 3px;
- border: 1px solid var(--grey-4);
+ background-color: var(--grey-2);
+ border: none;
+ border-radius: 5px;
+ width: 100%;
text-align: left;
color: var(--ink);
font-size: 14px;
+ padding-left: 8px;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
}
.uk-text-right {
diff --git a/packages/builder/src/components/common/Block.svelte b/packages/builder/src/components/common/Block.svelte
index c796f66f10..fc1958a211 100644
--- a/packages/builder/src/components/common/Block.svelte
+++ b/packages/builder/src/components/common/Block.svelte
@@ -15,16 +15,16 @@
diff --git a/packages/builder/src/components/common/ValuesList.svelte b/packages/builder/src/components/common/ValuesList.svelte
index 53a16455cc..08c515ca71 100644
--- a/packages/builder/src/components/common/ValuesList.svelte
+++ b/packages/builder/src/components/common/ValuesList.svelte
@@ -15,16 +15,35 @@
$: valuesText = join("\n")(values)
-
-
+
diff --git a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
index 409f4b9892..8638c8c63f 100644
--- a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
+++ b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
@@ -87,7 +87,6 @@
{$backendUiStore.selectedModel.name}
@@ -208,8 +207,4 @@
align-items: center;
}
- .button-inner i {
- margin-right: 5px;
- font-size: 20px;
- }
diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
index 021006e788..e5a764b8cc 100644
--- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
+++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
@@ -93,8 +93,12 @@
diff --git a/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte b/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte
index e84b975bb2..13f4a5223e 100644
--- a/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte
@@ -48,7 +48,6 @@
margin-top: 20px;
margin-bottom: 20px;
display: grid;
- grid-gap: 20px;
grid-template-columns: repeat(3, 1fr);
}
@@ -68,7 +67,7 @@
}
.selected {
- background: var(--blue-light);
+ background: var(--grey-3);
color: var(--ink);
}
diff --git a/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte b/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte
index 0bf563319b..f449c4c389 100644
--- a/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte
@@ -18,15 +18,14 @@
div {
padding: 0 10px 0 10px;
- width: 90%;
- height: 40px;
- border-radius: 3px;
+ height: 36px;
+ border-radius: 5px;
display: flex;
align-items: center;
transition: 0.3s background-color;
color: var(--ink);
- font-weight: 500;
- font-size: 16px;
+ font-weight: 400;
+ font-size: 14px;
margin-top: 4px;
margin-bottom: 4px;
}
@@ -41,7 +40,7 @@
}
i {
- color: var(--dark-grey);
+ color: var(--grey-7);
font-size: 20px;
margin-right: 8px;
}
diff --git a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
index 43008e1914..19778c278f 100644
--- a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
@@ -52,7 +52,7 @@
headings={HEADINGS}
bind:value={$backendUiStore.tabs.NAVIGATION_PANEL}>
{#if selectedTab === 'NAVIGATE'}
-