From 40835eae67e40f900f7a01b2f1c8c27fda6353e5 Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Fri, 10 Jul 2020 09:22:36 +0200
Subject: [PATCH 1/5] corrects background on general tab and bumps bbui version

---
 packages/builder/package.json                                | 4 ++--
 packages/builder/src/components/settings/tabs/General.svelte | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index de3adaf5f2..ea98efeef7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -55,7 +55,7 @@
     ]
   },
   "dependencies": {
-    "@budibase/bbui": "^1.15.4",
+    "@budibase/bbui": "^1.15.7",
     "@budibase/client": "^0.1.1",
     "@nx-js/compiler-util": "^2.0.0",
     "codemirror": "^5.51.0",
@@ -110,4 +110,4 @@
     "svelte-jester": "^1.0.6"
   },
   "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
+}
\ No newline at end of file
diff --git a/packages/builder/src/components/settings/tabs/General.svelte b/packages/builder/src/components/settings/tabs/General.svelte
index be4acacc24..8cf8200f74 100644
--- a/packages/builder/src/components/settings/tabs/General.svelte
+++ b/packages/builder/src/components/settings/tabs/General.svelte
@@ -40,11 +40,11 @@
 <style>
   .container {
     display: grid;
-    grid-gap: var(--space);
+    grid-gap: 16px;
   }
   .background {
     border-radius: 5px;
-    background-color: var(--light-grey);
+    background-color: var(--grey-1);
     padding: 12px 12px 18px 12px;
   }
 </style>

From 2b884a68a84a469a5437db76cafce4be8b6f44b2 Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Fri, 10 Jul 2020 09:27:50 +0200
Subject: [PATCH 2/5] updates error message when users are fetched

---
 packages/builder/src/components/settings/tabs/Users.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index 7befa25da9..8cfb97fae7 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -87,7 +87,8 @@
         {/each}
       </ul>
     {:catch error}
-      err0r
+      Something went wrong when trying to fetch users. Please refresh the page
+      and try again.
     {/await}
   </div>
 </div>

From c9be2fa2c4b0ff50ac9c901ba120b495c8b7b42b Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Fri, 10 Jul 2020 09:53:00 +0200
Subject: [PATCH 3/5] fix: corrects border radii on some elements in the users
 and api keys panels

---
 packages/builder/package.json                              | 2 +-
 packages/builder/src/components/settings/tabs/Users.svelte | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index ea98efeef7..bd52e6a2d8 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -55,7 +55,7 @@
     ]
   },
   "dependencies": {
-    "@budibase/bbui": "^1.15.7",
+    "@budibase/bbui": "^1.15.8",
     "@budibase/client": "^0.1.1",
     "@nx-js/compiler-util": "^2.0.0",
     "codemirror": "^5.51.0",
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index 8cfb97fae7..6ed62ea28a 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -118,6 +118,11 @@
     top: 12px;
     right: 12px;
   }
+  .create-button :global(button) {
+    font-size: var(--font-size-sm);
+    min-width: 100px;
+    border-radius: var(--rounded-small);
+  }
   .title {
     font-size: 14px;
     font-weight: 500;

From 2134d38fb97bcf85e761e595d3ca1fb89485110e Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Fri, 10 Jul 2020 09:57:47 +0200
Subject: [PATCH 4/5] fix: fixes gap in danger zone and removes placeholder
 message

---
 .../builder/src/components/settings/tabs/DangerZone.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/settings/tabs/DangerZone.svelte b/packages/builder/src/components/settings/tabs/DangerZone.svelte
index 524fee3351..352b33c426 100644
--- a/packages/builder/src/components/settings/tabs/DangerZone.svelte
+++ b/packages/builder/src/components/settings/tabs/DangerZone.svelte
@@ -30,7 +30,7 @@
     on:input={e => (value = e.target.value)}
     thin
     disabled={loading}
-    placeholder="Enter your name"
+    placeholder=""
     label="Type DELETE into the textbox, then click the following button to
     delete your web app:" />
 
@@ -46,7 +46,7 @@
 <style>
   .background {
     display: grid;
-    grid-gap: var(--space);
+    grid-gap: 16px;
     border-radius: 5px;
     background-color: var(--light-grey);
     padding: 12px 12px 18px 12px;

From bea29bd392dabb2da051d399fac4e540a0bd2c14 Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Fri, 10 Jul 2020 11:05:58 +0200
Subject: [PATCH 5/5] fix inconsistencies in heights and paddings

---
 .../builder/src/components/settings/UserRow.svelte | 12 ++++++++++++
 .../src/components/settings/tabs/Users.svelte      | 14 +++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/settings/UserRow.svelte b/packages/builder/src/components/settings/UserRow.svelte
index 1d7059552b..88477f02a8 100644
--- a/packages/builder/src/components/settings/UserRow.svelte
+++ b/packages/builder/src/components/settings/UserRow.svelte
@@ -39,4 +39,16 @@
     grid-gap: 18px;
     grid-template-columns: 1fr 1fr 1fr;
   }
+  .inputs :global(input) {
+    padding: 10px 12px;
+    border-radius: var(--rounded-small);
+  }
+  .inputs :global(select) {
+    padding: 9px 12px;
+    border-radius: var(--rounded-small);
+  }
+  .inputs :global(button) {
+    border-radius: var(--rounded-small);
+    height: initial;
+  }
 </style>
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index 6ed62ea28a..42059964d4 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -103,16 +103,12 @@
     display: grid;
     grid-gap: 12px;
     border-radius: 5px;
-    background-color: var(--grey-2);
+    background-color: var(--grey-1);
     padding: 12px 12px 18px 12px;
   }
   .background.create {
     background-color: var(--blue-light);
   }
-  .inputs :global(select) {
-    padding: 12px 9px;
-    height: initial;
-  }
   .create-button {
     position: absolute;
     top: 12px;
@@ -132,6 +128,14 @@
     grid-gap: 18px;
     grid-template-columns: 1fr 1fr 1fr;
   }
+  .inputs :global(input) {
+    padding: 10px 12px;
+    border-radius: var(--rounded-small);
+  }
+  .inputs :global(select) {
+    padding: 9px 12px;
+    border-radius: var(--rounded-small);
+  }
   ul {
     list-style: none;
     padding: 0;