From a24ce269538802e3933eee6ad0a34569610641e5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 7 Oct 2020 12:00:15 +0100
Subject: [PATCH] Remove padding on top nav bar so that things are properly
 centered

---
 packages/builder/src/components/common/Modal/Modal.svelte | 6 ++++--
 packages/builder/src/components/settings/Link.svelte      | 3 +--
 packages/builder/src/pages/[application]/_reset.svelte    | 6 ++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/common/Modal/Modal.svelte b/packages/builder/src/components/common/Modal/Modal.svelte
index cb334cb78b..496f5dfdfa 100644
--- a/packages/builder/src/components/common/Modal/Modal.svelte
+++ b/packages/builder/src/components/common/Modal/Modal.svelte
@@ -25,8 +25,10 @@
   export let showConfirmButton = true
   export let onConfirm = () => {}
   export let visible = false
+  export let loading = false
 
-  let loading = false
+  let confirmLoading = false
+  $: disabled = loading || confirmLoading || $$restProps.disabled
 
   function show() {
     if (visible) {
@@ -89,7 +91,7 @@
                     <Button
                       primary
                       {...$$restProps}
-                      disabled={$$restProps.disabled || loading}
+                      {disabled}
                       on:click={confirm}>
                       {confirmText}
                     </Button>
diff --git a/packages/builder/src/components/settings/Link.svelte b/packages/builder/src/components/settings/Link.svelte
index 22d47676bc..2591ef2c6f 100644
--- a/packages/builder/src/components/settings/Link.svelte
+++ b/packages/builder/src/components/settings/Link.svelte
@@ -20,8 +20,7 @@
   .topnavitemright {
     cursor: pointer;
     color: var(--grey-7);
-    margin: 0px 20px 0px 0px;
-    padding-top: 4px;
+    margin: 0 20px 0 0;
     font-weight: 500;
     font-size: 1rem;
     height: 100%;
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index a9744b8b8c..e33a46ad2c 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -127,8 +127,7 @@
   .topnavitem {
     cursor: pointer;
     color: var(--grey-5);
-    margin: 0px 00px 0px 20px;
-    padding-top: 4px;
+    margin: 0 0 0 20px;
     font-weight: 500;
     font-size: var(--font-size-m);
     height: 100%;
@@ -149,8 +148,7 @@
   .topnavitemright {
     cursor: pointer;
     color: var(--grey-7);
-    margin: 0px 20px 0px 0px;
-    padding-top: 4px;
+    margin: 0 20px 0 0;
     font-weight: 500;
     font-size: 1rem;
     height: 100%;