From 16e6da893bbe2f7b717230694cd003f49e729b3e Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Fri, 2 Jul 2021 14:02:18 +0200
Subject: [PATCH] Fix after rebase

---
 ts/editor/AutocompleteItem.svelte | 4 ++--
 ts/editor/Tag.svelte              | 4 ++--
 ts/editor/tagEditor.ts            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ts/editor/AutocompleteItem.svelte b/ts/editor/AutocompleteItem.svelte
index e4aa61f5e..338144398 100644
--- a/ts/editor/AutocompleteItem.svelte
+++ b/ts/editor/AutocompleteItem.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { onMount, createEventDispatcher, getContext } from "svelte";
-    import { nightModeKey } from "components/contextKeys";
+    import { nightModeKey } from "components/context-keys";
 
     export let id: string | undefined = undefined;
     let className = "";
@@ -39,7 +39,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </button>
 
 <style lang="scss">
-    @use 'ts/sass/button_mixins' as button;
+    @use 'ts/sass/button-mixins' as button;
 
     button {
         display: flex;
diff --git a/ts/editor/Tag.svelte b/ts/editor/Tag.svelte
index a00d312a0..ded03e9f9 100644
--- a/ts/editor/Tag.svelte
+++ b/ts/editor/Tag.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { getContext, createEventDispatcher } from "svelte";
-    import { nightModeKey } from "components/contextKeys";
+    import { nightModeKey } from "components/context-keys";
     import Badge from "components/Badge.svelte";
     import { deleteIcon } from "./icons";
     import { controlPressed, shiftPressed } from "lib/keys";
@@ -76,7 +76,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </button>
 
 <style lang="scss">
-    @use "ts/sass/button_mixins" as button;
+    @use "ts/sass/button-mixins" as button;
 
     @keyframes flash {
         0% {
diff --git a/ts/editor/tagEditor.ts b/ts/editor/tagEditor.ts
index 84c1e0db7..4f1c3733c 100644
--- a/ts/editor/tagEditor.ts
+++ b/ts/editor/tagEditor.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { disabledKey, nightModeKey } from "components/contextKeys";
+import { disabledKey, nightModeKey } from "components/context-keys";
 import { writable } from "svelte/store";
 
 import TagEditor from "./TagEditor.svelte";