From bdcdc684a3f98aa447a6251b46761fb2d438446a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Jun 2025 11:03:27 -0700 Subject: [PATCH] wip --- scss/_accordion.scss | 1 - scss/_alert.scss | 1 - scss/_badge.scss | 1 - scss/_breadcrumb.scss | 1 - scss/_button-group.scss | 1 - scss/_buttons.scss | 1 - scss/_card.scss | 1 - scss/_carousel.scss | 1 - scss/_close.scss | 1 - scss/_dropdown.scss | 1 - scss/_functions.scss | 2 +- scss/_list-group.scss | 1 - scss/_maps.scss | 1 - scss/_modal.scss | 1 - scss/_nav.scss | 1 - scss/_navbar.scss | 1 - scss/_offcanvas.scss | 1 - scss/_pagination.scss | 1 - scss/_placeholders.scss | 1 - scss/_popover.scss | 1 - scss/_progress.scss | 1 - scss/_root.scss | 1 - scss/_spinners.scss | 1 - scss/_toasts.scss | 1 - scss/_tooltip.scss | 1 - scss/_transitions.scss | 1 - scss/_utilities.scss | 1 - scss/_variables.scss | 113 ++++++++++++++++---------------- scss/bootstrap.scss | 79 +++++++++------------- scss/{ => content}/_images.scss | 1 - scss/{ => content}/_reboot.scss | 1 - scss/{ => content}/_tables.scss | 1 - scss/{ => content}/_type.scss | 1 - scss/content/index.scss | 4 ++ 34 files changed, 95 insertions(+), 133 deletions(-) rename scss/{ => content}/_images.scss (98%) rename scss/{ => content}/_reboot.scss (99%) rename scss/{ => content}/_tables.scss (99%) rename scss/{ => content}/_type.scss (98%) create mode 100644 scss/content/index.scss diff --git a/scss/_accordion.scss b/scss/_accordion.scss index fab27c7429..ceda3014d6 100644 --- 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 index ef504ca4d9..ea0bf49fee 100644 --- 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 index 0abaff6523..c0fe1e6562 100644 --- 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 index 27e1905305..290dde9f5a 100644 --- 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 index 04b4c68272..00354c80e3 100644 --- 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 index 34f08cb55a..3ab12db702 100644 --- 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 index 0a88407b46..a4baab704a 100644 --- 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 index 68f1e54f33..ac62547a26 100644 --- 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 index 98140fb02d..997d96ed7c 100644 --- 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 index 70780dd715..cebf68fa35 100644 --- 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 index abf2c2022f..98d360850a 100644 --- 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 index f6f1e6a72c..c7b1f134cb 100644 --- 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 index 0580b66241..54c22695b4 100644 --- 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 index 1ce87af87e..a858e66d9d 100644 --- 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 index a8b05b7697..f4f1a07efd 100644 --- 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 index 643b3678d0..c54074db0e 100644 --- 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 index be0dc7e357..8c8c2533c7 100644 --- 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 index a06f1b60c9..1324c0c846 100644 --- 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 index f615f0a180..9afc342e9d 100644 --- 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 index 517d5f3acb..06118a50d1 100644 --- 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 index 386a59613d..b2fd99cf9a 100644 --- 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 index 61719935ab..feab3b55ab 100644 --- 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 index c13caee16b..01094b7e3d 100644 --- 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 index b248f2d828..741c1c2459 100644 --- 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 index 9a30c75742..24b503095e 100644 --- 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 index de779ea6b2..04f5ba152c 100644 --- 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 index f8a09b2959..880277e986 100644 --- 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 index 893c65e052..ab8c76375b 100644 --- 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-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-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. +// 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 +// 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. +// 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 +// 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 index 968f10348d..5909972944 100644 --- 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 *; - -<<<<<<< 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) - -// Layout & components +// Global CSS variables, layer definitions, and configuration @use "root"; -@use "reboot"; -@use "type"; -@use "images"; -// @import "containers"; -// @import "grid"; + +// Reboot & Content +@use "content"; + +// 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 "pagination"; -@use "badge"; -@use "alert"; -@use "progress"; -@use "list-group"; -@use "close"; -@use "toasts"; -@use "modal"; -@use "tooltip"; -@use "popover"; -@use "carousel"; -@use "spinners"; @use "offcanvas"; +@use "pagination"; @use "placeholders"; +@use "popover"; +@use "progress"; +@use "spinners"; +@use "toasts"; +@use "tooltip"; +@use "transitions"; // Helpers @use "helpers"; diff --git a/scss/_images.scss b/scss/content/_images.scss similarity index 98% rename from scss/_images.scss rename to scss/content/_images.scss index f2858f6585..2611e30c64 100644 --- a/scss/_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/_reboot.scss b/scss/content/_reboot.scss similarity index 99% rename from scss/_reboot.scss rename to scss/content/_reboot.scss index 35a789354f..b630cf21ce 100644 --- a/scss/_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/_tables.scss b/scss/content/_tables.scss similarity index 99% rename from scss/_tables.scss rename to scss/content/_tables.scss index dbcd2531d9..86d2b70143 100644 --- a/scss/_tables.scss +++ b/scss/content/_tables.scss @@ -1,5 +1,4 @@ @use "sass:map"; -@use "config" as *; @use "colors" as *; @use "variables" as *; @use "functions" as *; diff --git a/scss/_type.scss b/scss/content/_type.scss similarity index 98% rename from scss/_type.scss rename to scss/content/_type.scss index f13ea3863c..514b84c25e 100644 --- a/scss/_type.scss +++ b/scss/content/_type.scss @@ -1,4 +1,3 @@ -@use "config" as *; @use "variables" as *; @use "mixins/lists" as *; @use "vendor/rfs" as *; diff --git a/scss/content/index.scss b/scss/content/index.scss new file mode 100644 index 0000000000..e643f1b393 --- /dev/null +++ b/scss/content/index.scss @@ -0,0 +1,4 @@ +@forward "reboot"; +@forward "type"; +@forward "tables"; +@forward "images";