wip

mdo · mdo · commit 2d6dd7b022dd · 2025-06-02T11:09:36.000-07:00
diff --git a/scss/_accordion.scss b/scss/_accordion.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "functions" as *;
 @use "vendor/rfs" as *;
diff --git a/scss/_alert.scss b/scss/_alert.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 
diff --git a/scss/_badge.scss b/scss/_badge.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/gradients" as *;
diff --git a/scss/_breadcrumb.scss b/scss/_breadcrumb.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "vendor/rfs" as *;
diff --git a/scss/_button-group.scss b/scss/_button-group.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/box-shadow" as *;
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "colors" as *;
 @use "variables" as *;
 @use "functions" as *;
diff --git a/scss/_card.scss b/scss/_card.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/box-shadow" as *;
diff --git a/scss/_carousel.scss b/scss/_carousel.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/transition" as *;
 @use "mixins/clearfix" as *;
diff --git a/scss/_close.scss b/scss/_close.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/color-mode" as *;
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/caret" as *;
 @use "mixins/border-radius" as *;
diff --git a/scss/_functions.scss b/scss/_functions.scss
@@ -1,4 +1,4 @@
-@use "config" as *;
+@use "sass:map";
 
 // Bootstrap functions
 //
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "colors" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
diff --git a/scss/_maps.scss b/scss/_maps.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "colors" as *;
 @use "functions" as *;
 @use "variables" as *;
diff --git a/scss/_modal.scss b/scss/_modal.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/box-shadow" as *;
diff --git a/scss/_nav.scss b/scss/_nav.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/transition" as *;
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/box-shadow" as *;
diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/box-shadow" as *;
 @use "mixins/transition" as *;
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/lists" as *;
 @use "mixins/border-radius" as *;
diff --git a/scss/_placeholders.scss b/scss/_placeholders.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "colors" as *;
 @use "variables" as *;
 
diff --git a/scss/_popover.scss b/scss/_popover.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/box-shadow" as *;
diff --git a/scss/_progress.scss b/scss/_progress.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/transition" as *;
 @use "mixins/gradients" as *;
diff --git a/scss/_root.scss b/scss/_root.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "colors" as *;
 @use "variables" as *;
 @use "maps" as *;
diff --git a/scss/_spinners.scss b/scss/_spinners.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 
 //
diff --git a/scss/_toasts.scss b/scss/_toasts.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "vendor/rfs" as *;
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/border-radius" as *;
 @use "mixins/deprecate" as *;
diff --git a/scss/_transitions.scss b/scss/_transitions.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "mixins/transition" as *;
 
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
@@ -1,5 +1,4 @@
 @use "sass:map";
-@use "config" as *;
 @use "colors" as *;
 @use "variables" as *;
 @use "functions" as *;
diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "colors" as *;
 @use "functions" as *;
 
@@ -77,30 +76,34 @@ $escaped-characters: (
 //
 // Quickly modify global styling by enabling or disabling optional features.
 
-// $enable-caret:                true !default;
-// $enable-rounded:              true !default;
-// $enable-shadows:              false !default;
-// $enable-gradients:            false !default;
-// $enable-transitions:          true !default;
-// $enable-reduced-motion:       true !default;
-// $enable-smooth-scroll:        true !default;
-// $enable-grid-classes:         true !default;
-// $enable-container-classes:    true !default;
-// $enable-cssgrid:              false !default;
-// $enable-button-pointers:      true !default;
-// $enable-rfs:                  true !default;
-// $enable-validation-icons:     true !default;
-// $enable-negative-margins:     false !default;
-// $enable-deprecation-messages: true !default;
-// $enable-important-utilities:  true !default;
-
-// $enable-dark-mode:            true !default;
-// $color-mode-type:             data !default; // `data` or `media-query`
+$enable-caret:                true !default;
+$enable-rounded:              true !default;
+$enable-shadows:              false !default;
+$enable-gradients:            false !default;
+$enable-transitions:          true !default;
+$enable-reduced-motion:       true !default;
+$enable-smooth-scroll:        true !default;
+$enable-grid-classes:         true !default;
+$enable-container-classes:    true !default;
+$enable-cssgrid:              false !default;
+$enable-button-pointers:      true !default;
+$enable-rfs:                  true !default;
+$enable-validation-icons:     true !default;
+$enable-negative-margins:     false !default;
+$enable-deprecation-messages: true !default;
+$enable-important-utilities:  true !default;
+
+$enable-dark-mode:            true !default;
+$color-mode-type:             data !default; // `data` or `media-query`
 
 // Prefix for :root CSS variables
+$prefix:                      bs- !default;
+
+$color-mode-type:          "media-query" !default;
+$color-contrast-dark:      #000 !default;
+$color-contrast-light:     #fff !default;
+$min-contrast-ratio:         4.5 !default;
 
-// $variable-prefix:             bs- !default; // Deprecated in v5.2.0 for the shorter `$prefix`
-// $prefix:                      $variable-prefix !default;
 
 // Gradient
 //
@@ -185,54 +188,54 @@ $icon-link-icon-transform:    translate3d(.25em, 0, 0) !default;
 $paragraph-margin-bottom:   1rem !default;
 
 
-// // Grid breakpoints
-// //
-// // Define the minimum dimensions at which your layout will change,
-// // adapting to different screen sizes, for use in media queries.
-
-// // scss-docs-start grid-breakpoints
-// $grid-breakpoints: (
-//   xs: 0,
-//   sm: 576px,
-//   md: 768px,
-//   lg: 992px,
-//   xl: 1200px,
-//   xxl: 1400px
-// ) !default;
-// // scss-docs-end grid-breakpoints
+// Grid breakpoints
+//
+// Define the minimum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
+
+// scss-docs-start grid-breakpoints
+$grid-breakpoints: (
+  xs: 0,
+  sm: 576px,
+  md: 768px,
+  lg: 992px,
+  xl: 1200px,
+  xxl: 1400px
+) !default;
+// scss-docs-end grid-breakpoints
 
 // @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
 // @include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints");
 
 
-// // Grid containers
-// //
-// // Define the maximum width of `.container` for different screen sizes.
-
-// // scss-docs-start container-max-widths
-// $container-max-widths: (
-//   sm: 540px,
-//   md: 720px,
-//   lg: 960px,
-//   xl: 1140px,
-//   xxl: 1320px
-// ) !default;
-// // scss-docs-end container-max-widths
+// Grid containers
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+// scss-docs-start container-max-widths
+$container-max-widths: (
+  sm: 540px,
+  md: 720px,
+  lg: 960px,
+  xl: 1140px,
+  xxl: 1320px
+) !default;
+// scss-docs-end container-max-widths
 
 // @include _assert-ascending($container-max-widths, "$container-max-widths");
 
 
-// // Grid columns
-// //
-// // Set the number of columns and specify the width of the gutters.
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
 
-// $grid-columns:                12 !default;
-// $grid-gutter-width:           1.5rem !default;
-// $grid-row-columns:            6 !default;
+$grid-columns:                12 !default;
+$grid-gutter-width:           1.5rem !default;
+$grid-row-columns:            6 !default;
 
-// // Container padding
+// Container padding
 
-// $container-padding-x: $grid-gutter-width !default;
+$container-padding-x: $grid-gutter-width !default;
 
 
 // Components
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
@@ -1,61 +1,46 @@
-// @import "mixins/banner";
-// @include bsBanner("");
-
+/*!
+  * Bootstrap v6.0.0-dev (https://getbootstrap.com/)
+  * Copyright 2011-2025 The Bootstrap Authors
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
 
 // scss-docs-start import-stack
-// Configuration
-// @use "config" as *;
+// Global CSS variables, layer definitions, and configuration
+@use "root";
 
-<<<<<<< HEAD
-@import "functions";
-@import "variables";
-@import "variables-dark";
-@import "maps";
-@import "mixins";
-@import "utilities";
-=======
-// @import "functions";
-// @import "colors";
-// @import "variables";
-// @import "variables-dark";
-@use "maps";
-@use "mixins";
-// @use "utilities";
->>>>>>> 3ce5bfcfb (Migrate to Sass modules)
+// Reboot & Content
+@use "content";
 
-// Layout & components
-@use "root";
-@use "reboot";
-@use "type";
-@use "images";
-// @import "containers";
-// @import "grid";
+// Layout
 @use "layout";
-@use "tables";
+
+// Forms
 @use "forms";
+
+// Components
+@use "accordion";
+@use "alert";
+@use "badge";
+@use "breadcrumb";
 @use "buttons";
-@use "transitions";
-@use "dropdown";
 @use "button-group";
+@use "card";
+@use "carousel";
+@use "close";
+@use "dropdown";
+@use "list-group";
+@use "modal";
 @use "nav";
 @use "navbar";
-@use "card";
-@use "accordion";
-@use "breadcrumb";
+@use "offcanvas";
 @use "pagination";
-@use "badge";
-@use "alert";
+@use "placeholders";
+@use "popover";
 @use "progress";
-@use "list-group";
-@use "close";
+@use "spinners";
 @use "toasts";
-@use "modal";
 @use "tooltip";
-@use "popover";
-@use "carousel";
-@use "spinners";
-@use "offcanvas";
-@use "placeholders";
+@use "transitions";
 
 // Helpers
 @use "helpers";
diff --git a/scss/content/_images.scss b/scss/content/_images.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "variables" as *;
 @use "vendor/rfs" as *;
 @use "mixins/image" as *;
diff --git a/scss/content/_reboot.scss b/scss/content/_reboot.scss
@@ -1,4 +1,3 @@
-@use "config" as *;
 @use "colors" as *;
 @use "variables" as *;
 @use "vendor/rfs" as *;
diff --git a/scss/content/_tables.scss b/scss/content/_tables.scss
diff --git a/scss/content/_type.scss b/scss/content/_type.scss
diff --git a/scss/content/index.scss b/scss/content/index.scss

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@use "config" as *;`
`2`	`1`	`@use "variables" as *;`
`3`	`2`	`@use "functions" as *;`
`4`	`3`	`@use "vendor/rfs" as *;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@use "sass:map";`
`2`		`-@use "config" as *;`
`3`	`2`	`@use "variables" as *;`
`4`	`3`	`@use "mixins/border-radius" as *;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@use "config" as *;`
`2`	`1`	`@use "colors" as *;`
`3`	`2`	`@use "variables" as *;`
`4`	`3`	`@use "functions" as *;`