From 76ea48fadeef9918e81a8104b3f22185fb0faba4 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Wed, 28 Apr 2021 02:55:35 +0200
Subject: [PATCH] Make StickyBar flex

---
 ts/components/StickyBar.svelte   | 3 +++
 ts/editor/EditorToolbar.svelte   | 3 ---
 ts/editor/TemplateButtons.svelte | 2 +-
 ts/editor/toolbar.ts             | 5 +----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ts/components/StickyBar.svelte b/ts/components/StickyBar.svelte
index 1e37c5547..e3a9679c8 100644
--- a/ts/components/StickyBar.svelte
+++ b/ts/components/StickyBar.svelte
@@ -10,6 +10,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <style lang="scss">
     nav {
+        display: flex;
+        flex-wrap: wrap;
+
         position: sticky;
         top: 0;
         left: 0;
diff --git a/ts/editor/EditorToolbar.svelte b/ts/editor/EditorToolbar.svelte
index 3127cba72..700434dac 100644
--- a/ts/editor/EditorToolbar.svelte
+++ b/ts/editor/EditorToolbar.svelte
@@ -47,8 +47,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     <StickyBar>
         <NoteTypeButtons />
         <FormatInlineButtons />
-        <FormatBlockButtons />
-        <ColorButtons />
-        <TemplateButtons />
     </StickyBar>
 </WithTheming>
diff --git a/ts/editor/TemplateButtons.svelte b/ts/editor/TemplateButtons.svelte
index 3739e8836..2b2042702 100644
--- a/ts/editor/TemplateButtons.svelte
+++ b/ts/editor/TemplateButtons.svelte
@@ -60,7 +60,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     </WithShortcut>
 </ButtonGroup>
 
-<DropdownMenu id={matjaxMenuId}>
+<DropdownMenu id={mathjaxMenuId}>
     <WithShortcut shortcut="Control+KeyM, KeyM" let:createShortcut let:shortcutLabel>
         <DropdownItem on:click={() => wrap('\\(', '\\)')}>
             {tr.editingMathjaxInline}
diff --git a/ts/editor/toolbar.ts b/ts/editor/toolbar.ts
index 6f0c7e557..ef3111db3 100644
--- a/ts/editor/toolbar.ts
+++ b/ts/editor/toolbar.ts
@@ -36,7 +36,4 @@ export function initToolbar(i18n: Promise<void>): Promise<EditorToolbar> {
 // @ts-expect-error insufficient typing of svelte modules
 export { enableButtons, disableButtons } from "./EditorToolbar.svelte";
 // @ts-expect-error insufficient typing of svelte modules
-export {
-    updateActiveButtons,
-    clearActiveButtons,
-} from "components/CommandIconButton.svelte";
+export { updateActiveButtons, clearActiveButtons } from "components/CommandIconButton.svelte";