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/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/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