fixup! use bootstrap5 for new scorecards

mysociety · Jul 3, 2023 · cd36827 · cd36827
1 parent 5d2d360
commit cd36827
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 78 deletions.
diff --git a/caps/static/caps/scss/main.scss b/caps/static/caps/scss/main.scss
@@ -9,53 +9,53 @@
 // So imports in this file are relative to `<STATIC_ROOT>/caps/sass/main.scss`,
 // not `/caps/static/caps/caps/main.scss`.
 //
-// That’s why `@import "../../bootstrap5/<whatever>" works – because at the
+// That’s why `@import "../../bootstrap/<whatever>" works – because at the
 // point the Sass files are compiled, django.contrib.staticfiles has
-// already copied the bootstrap5 sass files into `<STATIC_ROOT>/bootstrap/`.
+// already copied the bootstrap sass files into `<STATIC_ROOT>/bootstrap/`.
 //
 // Note that this doesn't work on a dev thing with standard django-pipeline
 // due to this issue: https://github.com/jazzband/django-pipeline/issues/749
 // so we are using a fork with the patch from the above issue
 
 @import "variables";
 
-@import "../../bootstrap5/functions";
-@import "../../bootstrap5/variables";
-@import "../../bootstrap5/mixins";
-@import "../../bootstrap5/root";
-@import "../../bootstrap5/reboot";
-@import "../../bootstrap5/type";
-@import "../../bootstrap5/images";
-@import "../../bootstrap5/code";
-@import "../../bootstrap5/grid";
-@import "../../bootstrap5/tables";
-@import "../../bootstrap5/forms";
-@import "../../bootstrap5/buttons";
-@import "../../bootstrap5/transitions";
-// @import "../../bootstrap5/dropdown";
-// @import "../../bootstrap5/button-group";
-// @import "../../bootstrap5/input-group";
-// @import "../../bootstrap5/custom-forms";
-@import "../../bootstrap5/nav";
-@import "../../bootstrap5/navbar";
-@import "../../bootstrap5/card";
-// @import "../../bootstrap5/breadcrumb";
-// @import "../../bootstrap5/pagination";
-@import "../../bootstrap5/badge";
-// @import "../../bootstrap5/jumbotron";
-// @import "../../bootstrap5/alert";
-@import "../../bootstrap5/progress";
-// @import "../../bootstrap5/media";
-// @import "../../bootstrap5/list-group";
-// @import "../../bootstrap5/close";
-// @import "../../bootstrap5/toasts";
-@import "../../bootstrap5/modal";
-@import "../../bootstrap5/tooltip";
-// @import "../../bootstrap5/popover";
-// @import "../../bootstrap5/carousel";
-@import "../../bootstrap5/spinners";
-@import "../../bootstrap5/utilities";
-@import "../../bootstrap5/print";
+@import "../../bootstrap/functions";
+@import "../../bootstrap/variables";
+@import "../../bootstrap/mixins";
+@import "../../bootstrap/root";
+@import "../../bootstrap/reboot";
+@import "../../bootstrap/type";
+@import "../../bootstrap/images";
+@import "../../bootstrap/code";
+@import "../../bootstrap/grid";
+@import "../../bootstrap/tables";
+@import "../../bootstrap/forms";
+@import "../../bootstrap/buttons";
+@import "../../bootstrap/transitions";
+// @import "../../bootstrap/dropdown";
+// @import "../../bootstrap/button-group";
+// @import "../../bootstrap/input-group";
+// @import "../../bootstrap/custom-forms";
+@import "../../bootstrap/nav";
+@import "../../bootstrap/navbar";
+@import "../../bootstrap/card";
+// @import "../../bootstrap/breadcrumb";
+// @import "../../bootstrap/pagination";
+@import "../../bootstrap/badge";
+// @import "../../bootstrap/jumbotron";
+// @import "../../bootstrap/alert";
+@import "../../bootstrap/progress";
+// @import "../../bootstrap/media";
+// @import "../../bootstrap/list-group";
+// @import "../../bootstrap/close";
+// @import "../../bootstrap/toasts";
+@import "../../bootstrap/modal";
+@import "../../bootstrap/tooltip";
+// @import "../../bootstrap/popover";
+// @import "../../bootstrap/carousel";
+@import "../../bootstrap/spinners";
+@import "../../bootstrap/utilities";
+@import "../../bootstrap/print";
 
 @import "awesomplete";
 @import "equilateral-triangle";

diff --git a/scoring/static/scoring/scss/main.scss b/scoring/static/scoring/scss/main.scss
@@ -9,53 +9,53 @@
 // So imports in this file are relative to `<STATIC_ROOT>/scoring/sass/main.scss`,
 // not `/caps/static/scoring/scss/main.scss`.
 //
-// That’s why `@import "../../bootstrap/<whatever>" works – because at the
+// That’s why `@import "../../bootstrap5/<whatever>" works – because at the
 // point the Sass files are compiled, django.contrib.staticfiles has
-// already copied the Bootstrap sass files into `<STATIC_ROOT>/bootstrap/`.
+// already copied the bootstrap5 sass files into `<STATIC_ROOT>/bootstrap5/`.
 //
 // Note that this doesn't work on a dev thing with standard django-pipeline
 // due to this issue: https://github.com/jazzband/django-pipeline/issues/749
 // so we are using a fork with the patch from the above issue
 
 @import "variables";
 
-@import "../../bootstrap/functions";
-@import "../../bootstrap/variables";
-@import "../../bootstrap/mixins";
-@import "../../bootstrap/root";
-@import "../../bootstrap/reboot";
-@import "../../bootstrap/type";
-@import "../../bootstrap/images";
-@import "../../bootstrap/code";
-@import "../../bootstrap/grid";
-@import "../../bootstrap/tables";
-@import "../../bootstrap/forms";
-@import "../../bootstrap/buttons";
-@import "../../bootstrap/transitions";
-// @import "../../bootstrap/dropdown";
-@import "../../bootstrap/button-group";
-// @import "../../bootstrap/input-group";
-// @import "../../bootstrap/custom-forms";
-@import "../../bootstrap/nav";
-@import "../../bootstrap/navbar";
-@import "../../bootstrap/card";
-// @import "../../bootstrap/breadcrumb";
-// @import "../../bootstrap/pagination";
-@import "../../bootstrap/badge";
-// @import "../../bootstrap/jumbotron";
-@import "../../bootstrap/alert";
-@import "../../bootstrap/progress";
-// @import "../../bootstrap/media";
-@import "../../bootstrap/list-group";
-// @import "../../bootstrap/close";
-// @import "../../bootstrap/toasts";
-@import "../../bootstrap/modal";
-@import "../../bootstrap/tooltip";
-// @import "../../bootstrap/popover";
-// @import "../../bootstrap/carousel";
-@import "../../bootstrap/spinners";
-@import "../../bootstrap/utilities";
-@import "../../bootstrap/print";
+@import "../../bootstrap5/functions";
+@import "../../bootstrap5/variables";
+@import "../../bootstrap5/mixins";
+@import "../../bootstrap5/root";
+@import "../../bootstrap5/reboot";
+@import "../../bootstrap5/type";
+@import "../../bootstrap5/images";
+@import "../../bootstrap5/code";
+@import "../../bootstrap5/grid";
+@import "../../bootstrap5/tables";
+@import "../../bootstrap5/forms";
+@import "../../bootstrap5/buttons";
+@import "../../bootstrap5/transitions";
+// @import "../../bootstrap5/dropdown";
+@import "../../bootstrap5/button-group";
+// @import "../../bootstrap5/input-group";
+// @import "../../bootstrap5/custom-forms";
+@import "../../bootstrap5/nav";
+@import "../../bootstrap5/navbar";
+@import "../../bootstrap5/card";
+// @import "../../bootstrap5/breadcrumb";
+// @import "../../bootstrap5/pagination";
+@import "../../bootstrap5/badge";
+// @import "../../bootstrap5/jumbotron";
+@import "../../bootstrap5/alert";
+@import "../../bootstrap5/progress";
+// @import "../../bootstrap5/media";
+@import "../../bootstrap5/list-group";
+// @import "../../bootstrap5/close";
+// @import "../../bootstrap5/toasts";
+@import "../../bootstrap5/modal";
+@import "../../bootstrap5/tooltip";
+// @import "../../bootstrap5/popover";
+// @import "../../bootstrap5/carousel";
+@import "../../bootstrap5/spinners";
+@import "../../bootstrap5/utilities";
+@import "../../bootstrap5/print";
 
 @import "mixins";
 @import "containers";