From 97692e4c285b288f3b0317d90fccc5e1accd49ed Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sat, 12 Jun 2021 00:38:56 +0200
Subject: [PATCH] Reverse RevertButton being on the right side

---
 ts/deckoptions/Badge.svelte           | 5 ++++-
 ts/deckoptions/EnumSelectorRow.svelte | 2 +-
 ts/deckoptions/RevertButton.svelte    | 6 ++++--
 ts/deckoptions/SpinBoxFloatRow.svelte | 2 +-
 ts/deckoptions/SpinBoxRow.svelte      | 2 +-
 ts/deckoptions/StepsInputRow.svelte   | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ts/deckoptions/Badge.svelte b/ts/deckoptions/Badge.svelte
index 03342cefd..720a4d880 100644
--- a/ts/deckoptions/Badge.svelte
+++ b/ts/deckoptions/Badge.svelte
@@ -5,6 +5,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import { onMount, createEventDispatcher } from "svelte";
 
+    let className = "";
+    export { className as class };
+
     const dispatch = createEventDispatcher();
 
     let spanRef: HTMLSpanElement;
@@ -14,7 +17,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     });
 </script>
 
-<span bind:this={spanRef} class="badge" on:click>
+<span bind:this={spanRef} class={`badge ${className}`} on:click>
     <slot />
 </span>
 
diff --git a/ts/deckoptions/EnumSelectorRow.svelte b/ts/deckoptions/EnumSelectorRow.svelte
index 7bcf11760..b93fca1db 100644
--- a/ts/deckoptions/EnumSelectorRow.svelte
+++ b/ts/deckoptions/EnumSelectorRow.svelte
@@ -23,7 +23,7 @@
         <TooltipLabel {markdownTooltip}><slot /></TooltipLabel>
     </Col>
     <Col {breakpoint} size={5}>
-        <RevertButton bind:value {defaultValue} />
         <EnumSelector bind:value {choices} />
+        <RevertButton bind:value {defaultValue} />
     </Col>
 </Row>
diff --git a/ts/deckoptions/RevertButton.svelte b/ts/deckoptions/RevertButton.svelte
index 4fa1bceb5..39309123a 100644
--- a/ts/deckoptions/RevertButton.svelte
+++ b/ts/deckoptions/RevertButton.svelte
@@ -36,8 +36,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <span class:invisible={!modified}>
     <WithTooltip tooltip={tr.deckConfigRevertButtonTooltip()} let:createTooltip>
-        <Badge on:mount={(event) => createTooltip(event.detail.span)} on:click={revert}
-            >{@html revertIcon}</Badge
+        <Badge
+            class="px-1"
+            on:mount={(event) => createTooltip(event.detail.span)}
+            on:click={revert}>{@html revertIcon}</Badge
         >
     </WithTooltip>
 </span>
diff --git a/ts/deckoptions/SpinBoxFloatRow.svelte b/ts/deckoptions/SpinBoxFloatRow.svelte
index e94644465..b3e5a3888 100644
--- a/ts/deckoptions/SpinBoxFloatRow.svelte
+++ b/ts/deckoptions/SpinBoxFloatRow.svelte
@@ -21,7 +21,7 @@
         <TooltipLabel {markdownTooltip}><slot /></TooltipLabel>
     </Col>
     <Col size={5}>
-        <RevertButton bind:value {defaultValue} />
         <SpinBoxFloat bind:value {min} {max} />
+        <RevertButton bind:value {defaultValue} />
     </Col>
 </Row>
diff --git a/ts/deckoptions/SpinBoxRow.svelte b/ts/deckoptions/SpinBoxRow.svelte
index e9030b927..77002edcd 100644
--- a/ts/deckoptions/SpinBoxRow.svelte
+++ b/ts/deckoptions/SpinBoxRow.svelte
@@ -21,7 +21,7 @@
         <TooltipLabel {markdownTooltip}><slot /></TooltipLabel>
     </Col>
     <Col size={5}>
-        <RevertButton bind:value {defaultValue} />
         <SpinBox bind:value {min} {max} />
+        <RevertButton bind:value {defaultValue} />
     </Col>
 </Row>
diff --git a/ts/deckoptions/StepsInputRow.svelte b/ts/deckoptions/StepsInputRow.svelte
index 064c25df1..722172bbe 100644
--- a/ts/deckoptions/StepsInputRow.svelte
+++ b/ts/deckoptions/StepsInputRow.svelte
@@ -19,7 +19,7 @@
         <TooltipLabel {markdownTooltip}><slot /></TooltipLabel>
     </Col>
     <Col size={5}>
-        <RevertButton bind:value {defaultValue} />
         <StepsInput bind:value />
+        <RevertButton bind:value {defaultValue} />
     </Col>
 </Row>