From a275214b586ba070ac1984663af607c17a46ddcf Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 19 Jun 2025 12:22:40 +0100
Subject: [PATCH] imports

---
 .../import-anki-package/ImportAnkiPackagePage.svelte      | 2 ++
 .../import-anki-package/import-anki-package-base.scss     | 8 ++++----
 ts/routes/import-anki-package/index.ts                    | 2 --
 ts/routes/import-csv/ImportCsvPage.svelte                 | 1 +
 ts/routes/import-csv/import-csv-base.scss                 | 8 ++++----
 ts/routes/import-csv/index.ts                             | 2 --
 ts/routes/import-page/ImportPage.svelte                   | 2 ++
 ts/routes/import-page/import-page-base.scss               | 6 +++---
 ts/routes/import-page/index.ts                            | 2 --
 9 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/ts/routes/import-anki-package/ImportAnkiPackagePage.svelte b/ts/routes/import-anki-package/ImportAnkiPackagePage.svelte
index cc75fda3e..c4f84ad2a 100644
--- a/ts/routes/import-anki-package/ImportAnkiPackagePage.svelte
+++ b/ts/routes/import-anki-package/ImportAnkiPackagePage.svelte
@@ -3,6 +3,8 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
+    import "./import-anki-package-base.scss";
+
     import type { ImportAnkiPackageOptions } from "@generated/anki/import_export_pb";
     import { importAnkiPackage } from "@generated/backend";
     import * as tr from "@generated/ftl";
diff --git a/ts/routes/import-anki-package/import-anki-package-base.scss b/ts/routes/import-anki-package/import-anki-package-base.scss
index 58cc5daa6..34ca0f7b8 100644
--- a/ts/routes/import-anki-package/import-anki-package-base.scss
+++ b/ts/routes/import-anki-package/import-anki-package-base.scss
@@ -1,6 +1,6 @@
-@use "../lib/sass/bootstrap-dark";
+@use "../../lib/sass/bootstrap-dark";
 
-@import "../lib/sass/base";
+@import "../../lib/sass/base";
 
 @import "bootstrap/scss/alert";
 @import "bootstrap/scss/buttons";
@@ -10,8 +10,8 @@
 @import "bootstrap/scss/transitions";
 @import "bootstrap/scss/modal";
 @import "bootstrap/scss/carousel";
-@import "../lib/sass/bootstrap-forms";
-@import "../lib/sass/bootstrap-tooltip";
+@import "../../lib/sass/bootstrap-forms";
+@import "../../lib/sass/bootstrap-tooltip";
 
 .night-mode {
     @include bootstrap-dark.night-mode;
diff --git a/ts/routes/import-anki-package/index.ts b/ts/routes/import-anki-package/index.ts
index f709fe50c..5cd5c1ee4 100644
--- a/ts/routes/import-anki-package/index.ts
+++ b/ts/routes/import-anki-package/index.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import "./import-anki-package-base.scss";
-
 import { getImportAnkiPackagePresets } from "@generated/backend";
 import { ModuleName, setupI18n } from "@tslib/i18n";
 import { checkNightMode } from "@tslib/nightmode";
diff --git a/ts/routes/import-csv/ImportCsvPage.svelte b/ts/routes/import-csv/ImportCsvPage.svelte
index f7d8c0f88..111119a7c 100644
--- a/ts/routes/import-csv/ImportCsvPage.svelte
+++ b/ts/routes/import-csv/ImportCsvPage.svelte
@@ -3,6 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
+    import "./import-csv-base.scss";
     import Row from "$lib/components/Row.svelte";
 
     import ImportPage from "../import-page/ImportPage.svelte";
diff --git a/ts/routes/import-csv/import-csv-base.scss b/ts/routes/import-csv/import-csv-base.scss
index 58cc5daa6..34ca0f7b8 100644
--- a/ts/routes/import-csv/import-csv-base.scss
+++ b/ts/routes/import-csv/import-csv-base.scss
@@ -1,6 +1,6 @@
-@use "../lib/sass/bootstrap-dark";
+@use "../../lib/sass/bootstrap-dark";
 
-@import "../lib/sass/base";
+@import "../../lib/sass/base";
 
 @import "bootstrap/scss/alert";
 @import "bootstrap/scss/buttons";
@@ -10,8 +10,8 @@
 @import "bootstrap/scss/transitions";
 @import "bootstrap/scss/modal";
 @import "bootstrap/scss/carousel";
-@import "../lib/sass/bootstrap-forms";
-@import "../lib/sass/bootstrap-tooltip";
+@import "../../lib/sass/bootstrap-forms";
+@import "../../lib/sass/bootstrap-tooltip";
 
 .night-mode {
     @include bootstrap-dark.night-mode;
diff --git a/ts/routes/import-csv/index.ts b/ts/routes/import-csv/index.ts
index 743aa4e7e..0c1176030 100644
--- a/ts/routes/import-csv/index.ts
+++ b/ts/routes/import-csv/index.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import "./import-csv-base.scss";
-
 import { getCsvMetadata, getDeckNames, getNotetypeNames } from "@generated/backend";
 import { ModuleName, setupI18n } from "@tslib/i18n";
 import { checkNightMode } from "@tslib/nightmode";
diff --git a/ts/routes/import-page/ImportPage.svelte b/ts/routes/import-page/ImportPage.svelte
index f3aec8f66..2103d982a 100644
--- a/ts/routes/import-page/ImportPage.svelte
+++ b/ts/routes/import-page/ImportPage.svelte
@@ -9,6 +9,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <script lang="ts">
+    import "./import-page-base.scss";
+    
     import type { ImportResponse } from "@generated/anki/import_export_pb";
     import { importDone } from "@generated/backend";
 
diff --git a/ts/routes/import-page/import-page-base.scss b/ts/routes/import-page/import-page-base.scss
index fe96efcac..475b4d676 100644
--- a/ts/routes/import-page/import-page-base.scss
+++ b/ts/routes/import-page/import-page-base.scss
@@ -1,8 +1,8 @@
-@use "../lib/sass/bootstrap-dark";
+@use "../../lib/sass/bootstrap-dark";
 
-@import "../lib/sass/base";
+@import "../../lib/sass/base";
 
-@import "../lib/sass/bootstrap-tooltip";
+@import "../../lib/sass/bootstrap-tooltip";
 @import "bootstrap/scss/buttons";
 
 .night-mode {
diff --git a/ts/routes/import-page/index.ts b/ts/routes/import-page/index.ts
index 68e03ed9e..6ea705f92 100644
--- a/ts/routes/import-page/index.ts
+++ b/ts/routes/import-page/index.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import "./import-page-base.scss";
-
 import { importJsonFile, importJsonString } from "@generated/backend";
 import { ModuleName, setupI18n } from "@tslib/i18n";
 import { checkNightMode } from "@tslib/nightmode";