From 4a2d2a75c142c4f38cbc72bf113f36be5623ff5d Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 17 Aug 2021 21:25:38 +0200 Subject: [PATCH 1/4] Directly include CSS from bootstrap and codemirror packages --- ts/compile_sass.bzl | 5 ++++- ts/graphs/graphs-base.scss | 4 ++-- ts/sass/base.scss | 4 ++-- ts/sass/bootstrap/BUILD.bazel | 1 - ts/sass/button-mixins.scss | 4 ++-- ts/svelte/svelte.ts | 10 +++++----- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ts/compile_sass.bzl b/ts/compile_sass.bzl index 7ab1aba6a..82676dabb 100644 --- a/ts/compile_sass.bzl +++ b/ts/compile_sass.bzl @@ -14,7 +14,10 @@ def compile_sass(group, srcs, deps = [], visibility = ["//visibility:private"]): sourcemap = False, deps = deps, visibility = visibility, - include_paths = ["external/ankidesktop"], + include_paths = [ + "ts/sass", + "external/ankidesktop/ts/sass", + ], ) native.filegroup( diff --git a/ts/graphs/graphs-base.scss b/ts/graphs/graphs-base.scss index f85f0c898..acdf1c368 100644 --- a/ts/graphs/graphs-base.scss +++ b/ts/graphs/graphs-base.scss @@ -1,5 +1,5 @@ -@use 'ts/sass/base'; -@use 'ts/sass/scrollbar'; +@use 'base'; +@use 'scrollbar'; .night-mode { @include scrollbar.night-mode; diff --git a/ts/sass/base.scss b/ts/sass/base.scss index 5139aebeb..b7b511c6b 100644 --- a/ts/sass/base.scss +++ b/ts/sass/base.scss @@ -19,8 +19,8 @@ $utilities: ( ), ); -@import "ts/sass/bootstrap/bootstrap-reboot"; -@import "ts/sass/bootstrap/bootstrap-utilities"; +@import "bootstrap/scss/bootstrap-reboot"; +@import "bootstrap/scss/bootstrap-utilities"; /* Bootstrap "extensions" */ .flex-basis-100 { diff --git a/ts/sass/bootstrap/BUILD.bazel b/ts/sass/bootstrap/BUILD.bazel index 54062b233..5dda9e78d 100644 --- a/ts/sass/bootstrap/BUILD.bazel +++ b/ts/sass/bootstrap/BUILD.bazel @@ -9,7 +9,6 @@ vendor_js_lib( ], base = "external/npm/node_modules/bootstrap/", pkg = pkg_from_name("bootstrap"), - strip_prefix = "scss/", visibility = ["//visibility:private"], ) diff --git a/ts/sass/button-mixins.scss b/ts/sass/button-mixins.scss index 9ca989f28..bf47a36b9 100644 --- a/ts/sass/button-mixins.scss +++ b/ts/sass/button-mixins.scss @@ -1,5 +1,5 @@ -@import "ts/sass/bootstrap/functions"; -@import "ts/sass/bootstrap/variables"; +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; @mixin btn-border-radius { border-top-left-radius: var(--border-left-radius); diff --git a/ts/svelte/svelte.ts b/ts/svelte/svelte.ts index 0f05831bc..e2f6093f9 100644 --- a/ts/svelte/svelte.ts +++ b/ts/svelte/svelte.ts @@ -153,13 +153,13 @@ async function writeJs( const preprocessOptions = preprocess({ scss: { includePaths: [ - binDir, - genDir, + `${binDir}/ts/sass`, + `${genDir}/ts/sass`, // a nasty hack to ensure ts/sass/... resolves correctly // when invoked from an external workspace - binDir + "/external/ankidesktop", - genDir + "/external/ankidesktop", - binDir + "/../../../external/ankidesktop", + `${binDir}/external/ankidesktop/ts/sass`, + `${genDir}/external/ankidesktop/ts/sass`, + `${binDir}/../../../external/ankidesktop/ts/sass`, ], }, }); From 8ff8186aabd4497dbc151a45c09a4b3a1a125351 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 17 Aug 2021 22:07:28 +0200 Subject: [PATCH 2/4] Uniformly shorten SCSS imports/uses --- ts/change-notetype/change-notetype-base.scss | 20 ++++++------- ts/components/DropdownItem.svelte | 2 +- ts/components/IconButton.svelte | 2 +- ts/components/LabelButton.svelte | 2 +- ts/components/SelectButton.svelte | 2 +- ts/congrats/congrats-base.scss | 4 +-- ts/deck-options/EnumSelector.svelte | 4 +-- ts/deck-options/SpinBox.svelte | 2 +- ts/deck-options/SpinBoxFloat.svelte | 2 +- ts/deck-options/StepsInput.svelte | 2 +- ts/deck-options/TextInputModal.svelte | 2 +- ts/deck-options/deck-options-base.scss | 30 ++++++++++---------- ts/editor/bootstrap.scss | 12 ++++---- ts/editor/editable.scss | 8 +++--- ts/editor/fields.scss | 4 +-- ts/svelte/svelte.ts | 1 + 16 files changed, 50 insertions(+), 49 deletions(-) diff --git a/ts/change-notetype/change-notetype-base.scss b/ts/change-notetype/change-notetype-base.scss index b39c636e7..eb4d1c866 100644 --- a/ts/change-notetype/change-notetype-base.scss +++ b/ts/change-notetype/change-notetype-base.scss @@ -1,15 +1,15 @@ -@use "ts/sass/vars"; -@use "ts/sass/scrollbar"; -@use "ts/sass/bootstrap-dark"; +@use "vars"; +@use "scrollbar"; +@use "bootstrap-dark"; -@import "ts/sass/base"; +@import "base"; -@import "ts/sass/bootstrap/alert"; -@import "ts/sass/bootstrap/forms"; -@import "ts/sass/bootstrap/buttons"; -@import "ts/sass/bootstrap/button-group"; -@import "ts/sass/bootstrap/close"; -@import "ts/sass/bootstrap/grid"; +@import "bootstrap/scss/alert"; +@import "bootstrap/scss/forms"; +@import "bootstrap/scss/buttons"; +@import "bootstrap/scss/button-group"; +@import "bootstrap/scss/close"; +@import "bootstrap/scss/grid"; .night-mode { @include scrollbar.night-mode; diff --git a/ts/components/DropdownItem.svelte b/ts/components/DropdownItem.svelte index 5a2cedc58..e535720f1 100644 --- a/ts/components/DropdownItem.svelte +++ b/ts/components/DropdownItem.svelte @@ -34,7 +34,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html