Uniformly shorten SCSS imports/uses

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

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;

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;

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;

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);

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);

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;

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;

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;

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;

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;

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;

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;

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";

View file

@ -1,4 +1,4 @@
@use 'ts/sass/scrollbar'; @use 'scrollbar';
anki-editable { anki-editable {
display: block; display: block;
@ -37,9 +37,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;

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;

View file

@ -153,6 +153,7 @@ async function writeJs(
const preprocessOptions = preprocess({ const preprocessOptions = preprocess({
scss: { scss: {
includePaths: [ includePaths: [
"ts/sass",
`${binDir}/ts/sass`, `${binDir}/ts/sass`,
`${genDir}/ts/sass`, `${genDir}/ts/sass`,
// a nasty hack to ensure ts/sass/... resolves correctly // a nasty hack to ensure ts/sass/... resolves correctly