From 6f3e682c9f997546215597f419d4d6ace7b1e360 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Thu, 15 Apr 2021 16:10:01 +1000
Subject: [PATCH] move bootstrap into ts/sass

---
 ts/deckconfig/BUILD.bazel           |  2 +-
 ts/deckconfig/deckconfig-base.scss  | 14 +++++---------
 ts/sass/BUILD.bazel                 |  2 +-
 ts/sass/base.scss                   |  4 ++--
 ts/{ => sass}/bootstrap/BUILD.bazel |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)
 rename ts/{ => sass}/bootstrap/BUILD.bazel (95%)

diff --git a/ts/deckconfig/BUILD.bazel b/ts/deckconfig/BUILD.bazel
index b53e6d0a6..7aa188b90 100644
--- a/ts/deckconfig/BUILD.bazel
+++ b/ts/deckconfig/BUILD.bazel
@@ -11,9 +11,9 @@ compile_sass(
     group = "base_css",
     visibility = ["//visibility:public"],
     deps = [
-        "//ts/bootstrap:scss",
         "//ts/sass:base_lib",
         "//ts/sass:scrollbar_lib",
+        "//ts/sass/bootstrap",
     ],
 )
 
diff --git a/ts/deckconfig/deckconfig-base.scss b/ts/deckconfig/deckconfig-base.scss
index 9f4cf400a..08ee4ad6b 100644
--- a/ts/deckconfig/deckconfig-base.scss
+++ b/ts/deckconfig/deckconfig-base.scss
@@ -1,14 +1,10 @@
 @use "ts/sass/scrollbar";
-@use "ts/sass/core";
 
-@import "ts/bootstrap/functions";
-@import "ts/bootstrap/variables";
-@import "ts/bootstrap/mixins";
-@import "ts/bootstrap/helpers";
-@import "ts/bootstrap/dropdown";
-@import "ts/bootstrap/forms";
-@import "ts/bootstrap/buttons";
-@import "ts/bootstrap/button-group";
+@import "ts/sass/base";
+@import "ts/sass/bootstrap/dropdown";
+@import "ts/sass/bootstrap/forms";
+@import "ts/sass/bootstrap/buttons";
+@import "ts/sass/bootstrap/button-group";
 
 .night-mode {
     @include scrollbar.night-mode;
diff --git a/ts/sass/BUILD.bazel b/ts/sass/BUILD.bazel
index 9e77eec17..f9bf6b465 100644
--- a/ts/sass/BUILD.bazel
+++ b/ts/sass/BUILD.bazel
@@ -7,7 +7,7 @@ sass_library(
         "base.scss",
     ],
     visibility = ["//visibility:public"],
-    deps = ["//ts/bootstrap:scss"],
+    deps = ["//ts/sass/bootstrap"],
 )
 
 sass_library(
diff --git a/ts/sass/base.scss b/ts/sass/base.scss
index 7c506f4b6..863a17b38 100644
--- a/ts/sass/base.scss
+++ b/ts/sass/base.scss
@@ -6,8 +6,8 @@ $body-bg: var(--window-bg);
 $link-hover-color: var(--link);
 $link-hover-decoration: none;
 
-@import "ts/bootstrap/bootstrap-reboot";
-@import "ts/bootstrap/bootstrap-utilities";
+@import "ts/sass/bootstrap/bootstrap-reboot";
+@import "ts/sass/bootstrap/bootstrap-utilities";
 
 body {
     overscroll-behavior: none;
diff --git a/ts/bootstrap/BUILD.bazel b/ts/sass/bootstrap/BUILD.bazel
similarity index 95%
rename from ts/bootstrap/BUILD.bazel
rename to ts/sass/bootstrap/BUILD.bazel
index 6af952c9e..54062b233 100644
--- a/ts/bootstrap/BUILD.bazel
+++ b/ts/sass/bootstrap/BUILD.bazel
@@ -15,7 +15,7 @@ vendor_js_lib(
 
 # wrap them in a library
 sass_library(
-    name = "scss",
+    name = "bootstrap",
     srcs = [
         ":sass-sources",
     ],