GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 08:46:37 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Uniformly shorten SCSS imports/uses

Browse source
This commit is contained in:
Henrik Giesel 2021-08-17 22:07:28 +02:00
parent 4a2d2a75c1
commit 8ff8186aab
16 changed files with 50 additions and 49 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 "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;

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>
<style lang="scss">
@use 'ts/sass/button-mixins' as button;
@use 'button-mixins' as button;
button {
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>
<style lang="scss">
@use "ts/sass/button-mixins" as button;
@use "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 "ts/sass/button-mixins" as button;
@use "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 "ts/sass/button-mixins" as button;
@use "button-mixins" as button;
select {
height: var(--buttons-size);

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

@ -1,5 +1,5 @@
@use 'ts/sass/core';
@use 'ts/sass/scrollbar';
@use 'core';
@use '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>
<style lang="scss">
@use "ts/sass/night-mode" as nightmode;
@use "ts/sass/button-mixins" as button;
@use "night-mode" as nightmode;
@use "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 "ts/sass/night-mode" as nightmode;
@use "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 "ts/sass/night-mode" as nightmode;
@use "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 "ts/sass/night-mode" as nightmode;
@use "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 "ts/sass/night-mode" as nightmode;
@use "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 "ts/sass/vars";
@use "ts/sass/scrollbar";
@use "vars";
@use "scrollbar";
@import "ts/sass/base";
@import "ts/sass/bootstrap/containers";
@import "ts/sass/bootstrap/grid";
@import "ts/sass/bootstrap/dropdown";
@import "ts/sass/bootstrap/forms";
@import "ts/sass/bootstrap/buttons";
@import "ts/sass/bootstrap/button-group";
@import "ts/sass/bootstrap/transitions";
@import "ts/sass/bootstrap/modal";
@import "ts/sass/bootstrap/close";
@import "ts/sass/bootstrap/alert";
@import "ts/sass/bootstrap/tooltip";
@import "ts/sass/bootstrap/badge";
@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";
.night-mode {
@include scrollbar.night-mode;

12
ts/editor/bootstrap.scss vendored
View file

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

8
ts/editor/editable.scss
View file

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

4
ts/editor/fields.scss
View file

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

1
ts/svelte/svelte.ts
View file

@ -153,6 +153,7 @@ 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