From de4d69454a1e83d72c34e1414d6fd71a8f45813e Mon Sep 17 00:00:00 2001
From: Matthias Metelka <62722460+kleinerpirat@users.noreply.github.com>
Date: Fri, 30 Sep 2022 03:43:08 +0200
Subject: [PATCH] Set line-height = 1 on inline floating-reference (#2096)

---
 ts/components/WithFloating.svelte             |  4 ++-
 ts/editor/editor-toolbar/LatexButton.svelte   | 17 +++++-----
 .../editor-toolbar/RemoveFormatButton.svelte  | 31 +++++++------------
 .../TagsSelectedButton.svelte                 |  2 --
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/ts/components/WithFloating.svelte b/ts/components/WithFloating.svelte
index c0ab7ae12..b3a70413f 100644
--- a/ts/components/WithFloating.svelte
+++ b/ts/components/WithFloating.svelte
@@ -185,7 +185,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <style lang="scss">
     @use "sass/elevation" as elevation;
-
+    span.floating-reference {
+        line-height: 1;
+    }
     .floating {
         position: absolute;
         border-radius: 5px;
diff --git a/ts/editor/editor-toolbar/LatexButton.svelte b/ts/editor/editor-toolbar/LatexButton.svelte
index 7f6335233..ba5a6b81d 100644
--- a/ts/editor/editor-toolbar/LatexButton.svelte
+++ b/ts/editor/editor-toolbar/LatexButton.svelte
@@ -76,13 +76,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     closeOnInsideClick
     inline
     on:close={() => (showFloating = false)}
-    let:asReference
 >
-    <span class="latex-button" use:asReference>
-        <IconButton {disabled} on:click={() => (showFloating = !showFloating)}>
-            {@html functionIcon}
-        </IconButton>
-    </span>
+    <IconButton
+        slot="reference"
+        {disabled}
+        on:click={() => (showFloating = !showFloating)}
+    >
+        {@html functionIcon}
+    </IconButton>
 
     <Popover slot="floating" --popover-padding-inline="0">
         {#each dropdownItems as [callback, keyCombination, label]}
@@ -108,8 +109,4 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     .shortcut {
         font: Verdana;
     }
-
-    .latex-button {
-        line-height: 1;
-    }
 </style>
diff --git a/ts/editor/editor-toolbar/RemoveFormatButton.svelte b/ts/editor/editor-toolbar/RemoveFormatButton.svelte
index 6f392b720..280b17480 100644
--- a/ts/editor/editor-toolbar/RemoveFormatButton.svelte
+++ b/ts/editor/editor-toolbar/RemoveFormatButton.svelte
@@ -119,20 +119,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     placement="bottom"
     inline
     on:close={() => (showFloating = false)}
-    let:asReference
 >
-    <span use:asReference class="remove-format-button">
-        <IconButton
-            tooltip={tr.editingSelectRemoveFormatting()}
-            {disabled}
-            widthMultiplier={0.5}
-            iconSize={120}
-            --border-right-radius="5px"
-            on:click={() => (showFloating = !showFloating)}
-        >
-            {@html chevronDown}
-        </IconButton>
-    </span>
+    <IconButton
+        slot="reference"
+        class="remove-format-button"
+        tooltip={tr.editingSelectRemoveFormatting()}
+        {disabled}
+        widthMultiplier={0.5}
+        iconSize={120}
+        --border-right-radius="5px"
+        on:click={() => (showFloating = !showFloating)}
+    >
+        {@html chevronDown}
+    </IconButton>
 
     <Popover slot="floating" --popover-padding-inline="0">
         {#each showFormats as format (format.name)}
@@ -143,9 +142,3 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         {/each}
     </Popover>
 </WithFloating>
-
-<style lang="scss">
-    .remove-format-button {
-        line-height: 1;
-    }
-</style>
diff --git a/ts/tag-editor/tag-options-button/TagsSelectedButton.svelte b/ts/tag-editor/tag-options-button/TagsSelectedButton.svelte
index 601427671..1826ede02 100644
--- a/ts/tag-editor/tag-options-button/TagsSelectedButton.svelte
+++ b/ts/tag-editor/tag-options-button/TagsSelectedButton.svelte
@@ -56,8 +56,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <style lang="scss">
     .tags-selected-button {
-        line-height: 1;
-
         :global(svg) {
             padding-bottom: 2px;
             cursor: pointer;