GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 14:32:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1332 from hgiesel/svelteexportcontext

Browse source 
Shorten CSS references for `@import` or `@use`
This commit is contained in:
Damien Elmes 2021-09-06 21:10:27 +10:00 committed by Damien Elmes
parent 9237f78d08
commit 8e79498d49
23 changed files with 67 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ts/change-notetype/change-notetype-base.scss
View file

@ -1,15 +1,15 @@
@use "ts/sass/vars"; @use "vars";
@use "ts/sass/scrollbar"; @use "scrollbar";
@use "ts/sass/bootstrap-dark"; @use "bootstrap-dark";
@import "ts/sass/base"; @import "base";
@import "ts/sass/bootstrap/alert"; @import "bootstrap/scss/alert";
@import "ts/sass/bootstrap/forms"; @import "bootstrap/scss/forms";
@import "ts/sass/bootstrap/buttons"; @import "bootstrap/scss/buttons";
@import "ts/sass/bootstrap/button-group"; @import "bootstrap/scss/button-group";
@import "ts/sass/bootstrap/close"; @import "bootstrap/scss/close";
@import "ts/sass/bootstrap/grid"; @import "bootstrap/scss/grid";
.night-mode { .night-mode {
@include scrollbar.night-mode; @include scrollbar.night-mode;

5
ts/compile_sass.bzl
View file

@ -14,7 +14,10 @@ def compile_sass(group, srcs, deps = [], visibility = ["//visibility:private"]):
sourcemap = False, sourcemap = False,
deps = deps, deps = deps,
visibility = visibility, visibility = visibility,
include_paths = ["external/ankidesktop"], include_paths = [
"ts/sass",
"external/ankidesktop/ts/sass",
],
) )
native.filegroup( native.filegroup(

2
ts/components/DropdownItem.svelte
View file

@ -34,7 +34,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</button> </button>
<style lang="scss"> <style lang="scss">
@use 'ts/sass/button-mixins' as button; @use 'button-mixins' as button;
button { button {
display: flex; display: flex;

2
ts/components/IconButton.svelte
View file

@ -48,7 +48,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</button> </button>
<style lang="scss"> <style lang="scss">
@use "ts/sass/button-mixins" as button; @use "button-mixins" as button;
button { button {
padding: 0; padding: 0;

2
ts/components/LabelButton.svelte
View file

@ -49,7 +49,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</button> </button>
<style lang="scss"> <style lang="scss">
@use "ts/sass/button-mixins" as button; @use "button-mixins" as button;
button { button {
padding: 0 calc(var(--buttons-size) / 3); padding: 0 calc(var(--buttons-size) / 3);

2
ts/components/SelectButton.svelte
View file

@ -39,7 +39,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</select> </select>
<style lang="scss"> <style lang="scss">
@use "ts/sass/button-mixins" as button; @use "button-mixins" as button;
select { select {
height: var(--buttons-size); height: var(--buttons-size);

4
ts/congrats/congrats-base.scss
View file

@ -1,5 +1,5 @@
@use 'ts/sass/core'; @use 'core';
@use 'ts/sass/scrollbar'; @use 'scrollbar';
.night-mode { .night-mode {
@include scrollbar.night-mode; @include scrollbar.night-mode;

4
ts/deck-options/EnumSelector.svelte
View file

@ -24,8 +24,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</select> </select>
<style lang="scss"> <style lang="scss">
@use "ts/sass/night-mode" as nightmode; @use "night-mode" as nightmode;
@use "ts/sass/button-mixins" as button; @use "button-mixins" as button;
.nightMode { .nightMode {
@include nightmode.input; @include nightmode.input;

2
ts/deck-options/SpinBox.svelte
View file

@ -34,7 +34,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
/> />
<style lang="scss"> <style lang="scss">
@use "ts/sass/night-mode" as nightmode; @use "night-mode" as nightmode;
.nightMode { .nightMode {
@include nightmode.input; @include nightmode.input;

2
ts/deck-options/SpinBoxFloat.svelte
View file

@ -32,7 +32,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
/> />
<style lang="scss"> <style lang="scss">
@use "ts/sass/night-mode" as nightmode; @use "night-mode" as nightmode;
.nightMode { .nightMode {
@include nightmode.input; @include nightmode.input;

2
ts/deck-options/StepsInput.svelte
View file

@ -28,7 +28,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
/> />
<style lang="scss"> <style lang="scss">
@use "ts/sass/night-mode" as nightmode; @use "night-mode" as nightmode;
.nightMode { .nightMode {
@include nightmode.input; @include nightmode.input;

2
ts/deck-options/TextInputModal.svelte
View file

@ -96,7 +96,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</div> </div>
<style lang="scss"> <style lang="scss">
@use "ts/sass/night-mode" as nightmode; @use "night-mode" as nightmode;
.nightMode { .nightMode {
@include nightmode.input; @include nightmode.input;

30
ts/deck-options/deck-options-base.scss
View file

@ -2,22 +2,22 @@ $tooltip-padding-y: 0.45rem;
$tooltip-padding-x: 0.65rem; $tooltip-padding-x: 0.65rem;
$tooltip-max-width: 300px; $tooltip-max-width: 300px;
@use "ts/sass/vars"; @use "vars";
@use "ts/sass/scrollbar"; @use "scrollbar";
@import "ts/sass/base"; @import "base";
@import "ts/sass/bootstrap/containers"; @import "bootstrap/scss/containers";
@import "ts/sass/bootstrap/grid"; @import "bootstrap/scss/grid";
@import "ts/sass/bootstrap/dropdown"; @import "bootstrap/scss/dropdown";
@import "ts/sass/bootstrap/forms"; @import "bootstrap/scss/forms";
@import "ts/sass/bootstrap/buttons"; @import "bootstrap/scss/buttons";
@import "ts/sass/bootstrap/button-group"; @import "bootstrap/scss/button-group";
@import "ts/sass/bootstrap/transitions"; @import "bootstrap/scss/transitions";
@import "ts/sass/bootstrap/modal"; @import "bootstrap/scss/modal";
@import "ts/sass/bootstrap/close"; @import "bootstrap/scss/close";
@import "ts/sass/bootstrap/alert"; @import "bootstrap/scss/alert";
@import "ts/sass/bootstrap/tooltip"; @import "bootstrap/scss/tooltip";
@import "ts/sass/bootstrap/badge"; @import "bootstrap/scss/badge";
.night-mode { .night-mode {
@include scrollbar.night-mode; @include scrollbar.night-mode;

12
ts/editor/bootstrap.scss vendored
View file

@ -1,9 +1,9 @@
@import "ts/sass/bootstrap/functions"; @import "bootstrap/scss/functions";
@import "ts/sass/bootstrap/variables"; @import "bootstrap/scss/variables";
@import "ts/sass/bootstrap/mixins"; @import "bootstrap/scss/mixins";
$btn-disabled-opacity: 0.4; $btn-disabled-opacity: 0.4;
@import "ts/sass/bootstrap/buttons"; @import "bootstrap/scss/buttons";
@import "ts/sass/bootstrap/button-group"; @import "bootstrap/scss/button-group";
@import "ts/sass/bootstrap/dropdown"; @import "bootstrap/scss/dropdown";

8
ts/editor/editable.scss
View file

@ -1,4 +1,4 @@
@use 'ts/sass/scrollbar'; @use 'scrollbar';
anki-editable { anki-editable {
display: block; display: block;
@ -42,9 +42,9 @@ img.drawing {
display: none; display: none;
} }
@import "ts/sass/codemirror/lib/codemirror"; @import "codemirror/lib/codemirror";
@import "ts/sass/codemirror/theme/monokai"; @import "codemirror/theme/monokai";
@import "ts/sass/codemirror/addon/fold/foldgutter"; @import "codemirror/addon/fold/foldgutter";
.CodeMirror { .CodeMirror {
height: auto; height: auto;

4
ts/editor/fields.scss
View file

@ -1,8 +1,8 @@
/* Copyright: Ankitects Pty Ltd and contributors /* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'ts/sass/base'; @use 'base';
@use 'ts/sass/scrollbar'; @use 'scrollbar';
.nightMode { .nightMode {
@include scrollbar.night-mode; @include scrollbar.night-mode;

4
ts/graphs/graphs-base.scss
View file

@ -1,5 +1,5 @@
@use 'ts/sass/base'; @use 'base';
@use 'ts/sass/scrollbar'; @use 'scrollbar';
.night-mode { .night-mode {
@include scrollbar.night-mode; @include scrollbar.night-mode;

1
ts/sass/anki Symbolic link
View file

@ -0,0 +1 @@
.

4
ts/sass/base.scss
View file

@ -19,8 +19,8 @@ $utilities: (
), ),
); );
@import "ts/sass/bootstrap/bootstrap-reboot"; @import "bootstrap/scss/bootstrap-reboot";
@import "ts/sass/bootstrap/bootstrap-utilities"; @import "bootstrap/scss/bootstrap-utilities";
/* Bootstrap "extensions" */ /* Bootstrap "extensions" */
.flex-basis-100 { .flex-basis-100 {

1
ts/sass/bootstrap/BUILD.bazel
View file

@ -9,7 +9,6 @@ vendor_js_lib(
], ],
base = "external/npm/node_modules/bootstrap/", base = "external/npm/node_modules/bootstrap/",
pkg = pkg_from_name("bootstrap"), pkg = pkg_from_name("bootstrap"),
strip_prefix = "scss/",
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
) )

4
ts/sass/button-mixins.scss
View file

@ -1,5 +1,5 @@
@import "ts/sass/bootstrap/functions"; @import "bootstrap/scss/functions";
@import "ts/sass/bootstrap/variables"; @import "bootstrap/scss/variables";
@mixin btn-border-radius { @mixin btn-border-radius {
border-top-left-radius: var(--border-left-radius); border-top-left-radius: var(--border-left-radius);

2
ts/svelte/svelte.bzl
View file

@ -93,7 +93,7 @@ def svelte_check(name = "svelte_check", srcs = []):
"//ts/lib", "//ts/lib",
"@npm//sass", "@npm//sass",
] + srcs, ] + srcs,
env = {"SASS_PATH": "$(rootpath //ts:tsconfig.json)/../.."}, env = {"SASS_PATH": "ts/sass"},
# a lack of sandboxing on Windows breaks the local svelte_check # a lack of sandboxing on Windows breaks the local svelte_check
# tests, so we need to disable them on Windows for now # tests, so we need to disable them on Windows for now
target_compatible_with = select({ target_compatible_with = select({

11
ts/svelte/svelte.ts
View file

@ -153,13 +153,14 @@ async function writeJs(
const preprocessOptions = preprocess({ const preprocessOptions = preprocess({
scss: { scss: {
includePaths: [ includePaths: [
binDir, "ts/sass",
genDir, `${binDir}/ts/sass`,
`${genDir}/ts/sass`,
// a nasty hack to ensure ts/sass/... resolves correctly // a nasty hack to ensure ts/sass/... resolves correctly
// when invoked from an external workspace // when invoked from an external workspace
binDir + "/external/ankidesktop", `${binDir}/external/ankidesktop/ts/sass`,
genDir + "/external/ankidesktop", `${genDir}/external/ankidesktop/ts/sass`,
binDir + "/../../../external/ankidesktop", `${binDir}/../../../external/ankidesktop/ts/sass`,
], ],
}, },
}); });