Skip to content

Commit 2d6dd7b

Browse files
mdomdo
committed
wip
1 parent f80a60b commit 2d6dd7b

34 files changed

+95
-133
lines changed

‎scss/_accordion.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "functions" as *;
43
@use "vendor/rfs" as *;

‎scss/_alert.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "variables" as *;
43
@use "mixins/border-radius" as *;
54

‎scss/_badge.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/gradients" as *;

‎scss/_breadcrumb.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "vendor/rfs" as *;

‎scss/_button-group.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/box-shadow" as *;

‎scss/_buttons.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "colors" as *;
32
@use "variables" as *;
43
@use "functions" as *;

‎scss/_card.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/box-shadow" as *;

‎scss/_carousel.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/transition" as *;
43
@use "mixins/clearfix" as *;

‎scss/_close.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/color-mode" as *;

‎scss/_dropdown.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "variables" as *;
43
@use "mixins/caret" as *;
54
@use "mixins/border-radius" as *;

‎scss/_functions.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "config" as *;
1+
@use "sass:map";
22

33
// Bootstrap functions
44
//

‎scss/_list-group.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "colors" as *;
43
@use "variables" as *;
54
@use "mixins/border-radius" as *;

‎scss/_maps.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "colors" as *;
43
@use "functions" as *;
54
@use "variables" as *;

‎scss/_modal.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "variables" as *;
43
@use "mixins/border-radius" as *;
54
@use "mixins/box-shadow" as *;

‎scss/_nav.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/transition" as *;

‎scss/_navbar.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "variables" as *;
43
@use "mixins/border-radius" as *;
54
@use "mixins/box-shadow" as *;

‎scss/_offcanvas.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "variables" as *;
43
@use "mixins/box-shadow" as *;
54
@use "mixins/transition" as *;

‎scss/_pagination.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/lists" as *;
43
@use "mixins/border-radius" as *;

‎scss/_placeholders.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "colors" as *;
32
@use "variables" as *;
43

‎scss/_popover.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/box-shadow" as *;

‎scss/_progress.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/transition" as *;
43
@use "mixins/gradients" as *;

‎scss/_root.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "colors" as *;
32
@use "variables" as *;
43
@use "maps" as *;

‎scss/_spinners.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32

43
//

‎scss/_toasts.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "vendor/rfs" as *;

‎scss/_tooltip.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/border-radius" as *;
43
@use "mixins/deprecate" as *;

‎scss/_transitions.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "mixins/transition" as *;
43

‎scss/_utilities.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "sass:map";
2-
@use "config" as *;
32
@use "colors" as *;
43
@use "variables" as *;
54
@use "functions" as *;

‎scss/_variables.scss

Lines changed: 61 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "colors" as *;
32
@use "functions" as *;
43

@@ -77,30 +76,34 @@ $escaped-characters: (
7776
//
7877
// Quickly modify global styling by enabling or disabling optional features.
7978

80-
// $enable-caret: true !default;
81-
// $enable-rounded: true !default;
82-
// $enable-shadows: false !default;
83-
// $enable-gradients: false !default;
84-
// $enable-transitions: true !default;
85-
// $enable-reduced-motion: true !default;
86-
// $enable-smooth-scroll: true !default;
87-
// $enable-grid-classes: true !default;
88-
// $enable-container-classes: true !default;
89-
// $enable-cssgrid: false !default;
90-
// $enable-button-pointers: true !default;
91-
// $enable-rfs: true !default;
92-
// $enable-validation-icons: true !default;
93-
// $enable-negative-margins: false !default;
94-
// $enable-deprecation-messages: true !default;
95-
// $enable-important-utilities: true !default;
96-
97-
// $enable-dark-mode: true !default;
98-
// $color-mode-type: data !default; // `data` or `media-query`
79+
$enable-caret: true !default;
80+
$enable-rounded: true !default;
81+
$enable-shadows: false !default;
82+
$enable-gradients: false !default;
83+
$enable-transitions: true !default;
84+
$enable-reduced-motion: true !default;
85+
$enable-smooth-scroll: true !default;
86+
$enable-grid-classes: true !default;
87+
$enable-container-classes: true !default;
88+
$enable-cssgrid: false !default;
89+
$enable-button-pointers: true !default;
90+
$enable-rfs: true !default;
91+
$enable-validation-icons: true !default;
92+
$enable-negative-margins: false !default;
93+
$enable-deprecation-messages: true !default;
94+
$enable-important-utilities: true !default;
95+
96+
$enable-dark-mode: true !default;
97+
$color-mode-type: data !default; // `data` or `media-query`
9998

10099
// Prefix for :root CSS variables
100+
$prefix: bs- !default;
101+
102+
$color-mode-type: "media-query" !default;
103+
$color-contrast-dark: #000 !default;
104+
$color-contrast-light: #fff !default;
105+
$min-contrast-ratio: 4.5 !default;
101106

102-
// $variable-prefix: bs- !default; // Deprecated in v5.2.0 for the shorter `$prefix`
103-
// $prefix: $variable-prefix !default;
104107

105108
// Gradient
106109
//
@@ -185,54 +188,54 @@ $icon-link-icon-transform: translate3d(.25em, 0, 0) !default;
185188
$paragraph-margin-bottom: 1rem !default;
186189

187190

188-
// // Grid breakpoints
189-
// //
190-
// // Define the minimum dimensions at which your layout will change,
191-
// // adapting to different screen sizes, for use in media queries.
192-
193-
// // scss-docs-start grid-breakpoints
194-
// $grid-breakpoints: (
195-
// xs: 0,
196-
// sm: 576px,
197-
// md: 768px,
198-
// lg: 992px,
199-
// xl: 1200px,
200-
// xxl: 1400px
201-
// ) !default;
202-
// // scss-docs-end grid-breakpoints
191+
// Grid breakpoints
192+
//
193+
// Define the minimum dimensions at which your layout will change,
194+
// adapting to different screen sizes, for use in media queries.
195+
196+
// scss-docs-start grid-breakpoints
197+
$grid-breakpoints: (
198+
xs: 0,
199+
sm: 576px,
200+
md: 768px,
201+
lg: 992px,
202+
xl: 1200px,
203+
xxl: 1400px
204+
) !default;
205+
// scss-docs-end grid-breakpoints
203206

204207
// @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
205208
// @include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints");
206209

207210

208-
// // Grid containers
209-
// //
210-
// // Define the maximum width of `.container` for different screen sizes.
211-
212-
// // scss-docs-start container-max-widths
213-
// $container-max-widths: (
214-
// sm: 540px,
215-
// md: 720px,
216-
// lg: 960px,
217-
// xl: 1140px,
218-
// xxl: 1320px
219-
// ) !default;
220-
// // scss-docs-end container-max-widths
211+
// Grid containers
212+
//
213+
// Define the maximum width of `.container` for different screen sizes.
214+
215+
// scss-docs-start container-max-widths
216+
$container-max-widths: (
217+
sm: 540px,
218+
md: 720px,
219+
lg: 960px,
220+
xl: 1140px,
221+
xxl: 1320px
222+
) !default;
223+
// scss-docs-end container-max-widths
221224

222225
// @include _assert-ascending($container-max-widths, "$container-max-widths");
223226

224227

225-
// // Grid columns
226-
// //
227-
// // Set the number of columns and specify the width of the gutters.
228+
// Grid columns
229+
//
230+
// Set the number of columns and specify the width of the gutters.
228231

229-
// $grid-columns: 12 !default;
230-
// $grid-gutter-width: 1.5rem !default;
231-
// $grid-row-columns: 6 !default;
232+
$grid-columns: 12 !default;
233+
$grid-gutter-width: 1.5rem !default;
234+
$grid-row-columns: 6 !default;
232235

233-
// // Container padding
236+
// Container padding
234237

235-
// $container-padding-x: $grid-gutter-width !default;
238+
$container-padding-x: $grid-gutter-width !default;
236239

237240

238241
// Components

‎scss/bootstrap.scss

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,46 @@
1-
// @import "mixins/banner";
2-
// @include bsBanner("");
3-
1+
/*!
2+
* Bootstrap v6.0.0-dev (https://getbootstrap.com/)
3+
* Copyright 2011-2025 The Bootstrap Authors
4+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
5+
*/
46

57
// scss-docs-start import-stack
6-
// Configuration
7-
// @use "config" as *;
8+
// Global CSS variables, layer definitions, and configuration
9+
@use "root";
810

9-
<<<<<<< HEAD
10-
@import "functions";
11-
@import "variables";
12-
@import "variables-dark";
13-
@import "maps";
14-
@import "mixins";
15-
@import "utilities";
16-
=======
17-
// @import "functions";
18-
// @import "colors";
19-
// @import "variables";
20-
// @import "variables-dark";
21-
@use "maps";
22-
@use "mixins";
23-
// @use "utilities";
24-
>>>>>>> 3ce5bfcfb (Migrate to Sass modules)
11+
// Reboot & Content
12+
@use "content";
2513

26-
// Layout & components
27-
@use "root";
28-
@use "reboot";
29-
@use "type";
30-
@use "images";
31-
// @import "containers";
32-
// @import "grid";
14+
// Layout
3315
@use "layout";
34-
@use "tables";
16+
17+
// Forms
3518
@use "forms";
19+
20+
// Components
21+
@use "accordion";
22+
@use "alert";
23+
@use "badge";
24+
@use "breadcrumb";
3625
@use "buttons";
37-
@use "transitions";
38-
@use "dropdown";
3926
@use "button-group";
27+
@use "card";
28+
@use "carousel";
29+
@use "close";
30+
@use "dropdown";
31+
@use "list-group";
32+
@use "modal";
4033
@use "nav";
4134
@use "navbar";
42-
@use "card";
43-
@use "accordion";
44-
@use "breadcrumb";
35+
@use "offcanvas";
4536
@use "pagination";
46-
@use "badge";
47-
@use "alert";
37+
@use "placeholders";
38+
@use "popover";
4839
@use "progress";
49-
@use "list-group";
50-
@use "close";
40+
@use "spinners";
5141
@use "toasts";
52-
@use "modal";
5342
@use "tooltip";
54-
@use "popover";
55-
@use "carousel";
56-
@use "spinners";
57-
@use "offcanvas";
58-
@use "placeholders";
43+
@use "transitions";
5944

6045
// Helpers
6146
@use "helpers";

‎scss/_images.scss renamed to ‎scss/content/_images.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "variables" as *;
32
@use "vendor/rfs" as *;
43
@use "mixins/image" as *;

‎scss/_reboot.scss renamed to ‎scss/content/_reboot.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "config" as *;
21
@use "colors" as *;
32
@use "variables" as *;
43
@use "vendor/rfs" as *;

0 commit comments

Comments
 (0)