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

Put sass into repo directory (#1409)

Browse source 
Fix Sass build
This commit is contained in:
Henrik Giesel 2021-10-09 02:25:03 +02:00 committed by GitHub
parent c63e0abd68
commit c64bac57a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 106 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/aqt/BUILD.bazel
View file

@ -14,7 +14,7 @@ genrule(
genrule(
name = "extract_sass_colors",
srcs = [
"//ts/sass:_vars.scss",
"//sass:_vars.scss",
],
outs = ["colors.py"],
cmd = "$(location //qt:extract_sass_colors) $< $@",

8
qt/aqt/data/web/css/BUILD.bazel
View file

@ -9,10 +9,10 @@ compile_sass(
),
group = "css_local",
deps = [
"//ts/sass:core_lib",
"//ts/sass:buttons_lib",
"//ts/sass:scrollbar_lib",
"//ts/sass:card_counts_lib",
"//sass:core_lib",
"//sass:buttons_lib",
"//sass:scrollbar_lib",
"//sass:card_counts_lib",
],
visibility = ["//visibility:private"],
)

2
qt/aqt/data/web/css/deckbrowser.scss
View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'ts/sass/card-counts';
@use 'sass/card-counts';
a.deck {
color: var(--text-fg);

2
qt/aqt/data/web/css/overview.scss
View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'ts/sass/card-counts';
@use 'sass/card-counts';
.smallLink {
font-size: 10px;

2
qt/aqt/data/web/css/reviewer-bottom.scss
View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'ts/sass/card-counts';
@use 'sass/card-counts';
:root {
--focus-color: #0078d7;

6
qt/aqt/data/web/css/webview.scss
View file

@ -1,9 +1,9 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'ts/sass/core';
@use 'ts/sass/scrollbar';
@use 'ts/sass/buttons';
@use 'sass/core';
@use 'sass/scrollbar';
@use 'sass/buttons';
// core.scss sets border-box, but we need to
// keep the old behaviour for now to avoid breaking

2
qt/aqt/data/web/js/compile_ts.bzl
View file

@ -9,7 +9,7 @@ def compile_ts(group, srcs):
name = name,
src = ts_file,
sourcemap = False,
deps = ["//ts/sass:core_lib"],
deps = ["//sass:core_lib"],
)
native.filegroup(

2
ts/sass/BUILD.bazel → sass/BUILD.bazel
View file

@ -9,7 +9,7 @@ sass_library(
"bootstrap-dark.scss",
],
visibility = ["//visibility:public"],
deps = ["//ts/sass/bootstrap", "//ts/sass/codemirror"],
deps = ["//sass/bootstrap", "//sass/codemirror"],
)
sass_library(

0
ts/sass/_fusion-vars.scss → sass/_fusion-vars.scss
View file

0
ts/sass/_vars.scss → sass/_vars.scss
View file

0
ts/sass/base.scss → sass/base.scss
View file

0
ts/sass/bootstrap-dark.scss → sass/bootstrap-dark.scss vendored
View file

0
ts/sass/bootstrap/BUILD.bazel → sass/bootstrap/BUILD.bazel
View file

0
ts/sass/button-mixins.scss → sass/button-mixins.scss
View file

0
ts/sass/buttons.scss → sass/buttons.scss
View file

0
ts/sass/card-counts.scss → sass/card-counts.scss
View file

0
ts/sass/codemirror/BUILD.bazel → sass/codemirror/BUILD.bazel
View file

0
ts/sass/core.scss → sass/core.scss
View file

0
ts/sass/night-mode.scss → sass/night-mode.scss
View file

0
ts/sass/scrollbar.scss → sass/scrollbar.scss
View file

10
ts/change-notetype/BUILD.bazel
View file

@ -11,9 +11,9 @@ compile_sass(
group = "base_css",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:base_lib",
"//ts/sass:scrollbar_lib",
"//ts/sass/bootstrap",
"//sass:base_lib",
"//sass:scrollbar_lib",
"//sass/bootstrap",
],
)
@ -71,8 +71,8 @@ svelte_check(
"*.ts",
"*.svelte",
]) + [
"//ts/sass:button_mixins_lib",
"//ts/sass/bootstrap",
"//sass:button_mixins_lib",
"//sass/bootstrap",
"@npm//@types/bootstrap",
"@npm//@types/lodash-es",
"@npm//@types/marked",

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

@ -1,15 +1,15 @@
@use "vars";
@use "scrollbar";
@use "bootstrap-dark";
@use "sass/vars";
@use "sass/scrollbar";
@use "sass/bootstrap-dark";
@import "base";
@import "sass/base";
@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";
@import "sass/bootstrap/scss/alert";
@import "sass/bootstrap/scss/forms";
@import "sass/bootstrap/scss/buttons";
@import "sass/bootstrap/scss/button-group";
@import "sass/bootstrap/scss/close";
@import "sass/bootstrap/scss/grid";
.night-mode {
@include scrollbar.night-mode;

6
ts/compile_sass.bzl
View file

@ -15,8 +15,10 @@ def compile_sass(group, srcs, deps = [], visibility = ["//visibility:private"]):
deps = deps,
visibility = visibility,
include_paths = [
"ts/sass",
"external/ankidesktop/ts/sass",
".",
"sass",
"external/ankidesktop",
"external/ankidesktop/sass",
],
)

8
ts/components/BUILD.bazel
View file

@ -31,10 +31,10 @@ svelte_check(
"*.ts",
"*.svelte",
]) + [
"//ts/sass:base_lib",
"//ts/sass:button_mixins_lib",
"//ts/sass:scrollbar_lib",
"//ts/sass/bootstrap",
"//sass:base_lib",
"//sass:button_mixins_lib",
"//sass:scrollbar_lib",
"//sass/bootstrap",
"@npm//@types/bootstrap",
"//ts/sveltelib:sveltelib_pkg",
],

2
ts/components/ButtonToolbar.svelte
View file

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

2
ts/components/DropdownItem.svelte
View file

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

2
ts/components/IconButton.svelte
View file

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

4
ts/congrats/BUILD.bazel
View file

@ -11,8 +11,8 @@ compile_sass(
group = "base_css",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:base_lib",
"//ts/sass:scrollbar_lib",
"//sass:base_lib",
"//sass:scrollbar_lib",
],
)

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

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

12
ts/deck-options/BUILD.bazel
View file

@ -12,9 +12,9 @@ compile_sass(
group = "base_css",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:base_lib",
"//ts/sass:scrollbar_lib",
"//ts/sass/bootstrap",
"//sass:base_lib",
"//sass:scrollbar_lib",
"//sass/bootstrap",
],
)
@ -73,9 +73,9 @@ svelte_check(
"*.ts",
"*.svelte",
]) + [
"//ts/sass:button_mixins_lib",
"//ts/sass:night_mode_lib",
"//ts/sass/bootstrap",
"//sass:button_mixins_lib",
"//sass:night_mode_lib",
"//sass/bootstrap",
"@npm//@types/bootstrap",
"@npm//@types/lodash-es",
"@npm//@types/marked",

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>
<style lang="scss">
@use "night-mode" as nightmode;
@use "button-mixins" as button;
@use "sass/night-mode" as nightmode;
@use "sass/button-mixins" as button;
.nightMode {
@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">
@use "night-mode" as nightmode;
@use "sass/night-mode" as nightmode;
.nightMode {
@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">
@use "night-mode" as nightmode;
@use "sass/night-mode" as nightmode;
.nightMode {
@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">
@use "night-mode" as nightmode;
@use "sass/night-mode" as nightmode;
.nightMode {
@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>
<style lang="scss">
@use "night-mode" as nightmode;
@use "sass/night-mode" as nightmode;
.nightMode {
@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-max-width: 300px;
@use "vars";
@use "scrollbar";
@use "sass/vars";
@use "sass/scrollbar";
@import "base";
@import "bootstrap/scss/containers";
@import "bootstrap/scss/grid";
@import "bootstrap/scss/dropdown";
@import "bootstrap/scss/forms";
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/button-group";
@import "bootstrap/scss/transitions";
@import "bootstrap/scss/modal";
@import "bootstrap/scss/close";
@import "bootstrap/scss/alert";
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/badge";
@import "sass/base";
@import "sass/bootstrap/scss/containers";
@import "sass/bootstrap/scss/grid";
@import "sass/bootstrap/scss/dropdown";
@import "sass/bootstrap/scss/forms";
@import "sass/bootstrap/scss/buttons";
@import "sass/bootstrap/scss/button-group";
@import "sass/bootstrap/scss/transitions";
@import "sass/bootstrap/scss/modal";
@import "sass/bootstrap/scss/close";
@import "sass/bootstrap/scss/alert";
@import "sass/bootstrap/scss/tooltip";
@import "sass/bootstrap/scss/badge";
.night-mode {
@include scrollbar.night-mode;

4
ts/editable/BUILD.bazel
View file

@ -12,8 +12,8 @@ compile_sass(
group = "editable_scss",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:scrollbar_lib",
"//ts/sass/codemirror",
"//sass:scrollbar_lib",
"//sass/codemirror",
],
)

2
ts/editable/editable-base.scss
View file

@ -1,4 +1,4 @@
@use "scrollbar";
@use "sass/scrollbar";
anki-editable {
display: block;

2
ts/editor/AutocompleteItem.svelte
View file

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

16
ts/editor/BUILD.bazel
View file

@ -13,10 +13,10 @@ compile_sass(
group = "base_css",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:base_lib",
"//ts/sass:button_mixins_lib",
"//ts/sass:buttons_lib",
"//ts/sass:scrollbar_lib",
"//sass:base_lib",
"//sass:button_mixins_lib",
"//sass:buttons_lib",
"//sass:scrollbar_lib",
],
)
@ -28,8 +28,8 @@ compile_sass(
group = "local_css",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:button_mixins_lib",
"//ts/sass/bootstrap",
"//sass:button_mixins_lib",
"//sass/bootstrap",
],
)
@ -82,8 +82,8 @@ svelte_check(
"*.ts",
"*.svelte",
]) + [
"//ts/sass:button_mixins_lib",
"//ts/sass/bootstrap",
"//sass:button_mixins_lib",
"//sass/bootstrap",
"@npm//@types/bootstrap",
"//ts/components",
"@npm//@types/codemirror",

2
ts/editor/Tag.svelte
View file

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

14
ts/editor/bootstrap.scss vendored
View file

@ -1,13 +1,13 @@
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
@import "sass/bootstrap/scss/functions";
@import "sass/bootstrap/scss/variables";
@import "sass/bootstrap/scss/mixins";
$btn-disabled-opacity: 0.4;
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/button-group";
@import "bootstrap/scss/dropdown";
@import "sass/bootstrap/scss/buttons";
@import "sass/bootstrap/scss/button-group";
@import "sass/bootstrap/scss/dropdown";
$tooltip-max-width: 600px;
@import "bootstrap/scss/tooltip";
@import "sass/bootstrap/scss/tooltip";

6
ts/editor/fields.scss
View file

@ -1,9 +1,9 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use "base";
@use "scrollbar";
@use "button-mixins";
@use "sass/base";
@use "sass/scrollbar";
@use "sass/button-mixins";
html,
body {

4
ts/graphs/BUILD.bazel
View file

@ -10,8 +10,8 @@ compile_sass(
group = "base_css",
visibility = ["//visibility:public"],
deps = [
"//ts/sass:base_lib",
"//ts/sass:scrollbar_lib",
"//sass:base_lib",
"//sass:scrollbar_lib",
],
)

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

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

2
ts/svelte/svelte.bzl
View file

@ -78,5 +78,5 @@ def svelte_check(name = "svelte_check", srcs = []):
data = [
"@npm//sass",
] + srcs,
env = {"SASS_PATH": "ts/sass"},
env = {"SASS_PATH": "sass"},
)

13
ts/svelte/svelte.ts
View file

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