diff --git a/scss/_colors.scss b/scss/_colors.scss index aca360bbed..169e84efdf 100644 --- a/scss/_colors.scss +++ b/scss/_colors.scss @@ -278,5 +278,7 @@ $all-colors: ( "yellows": $yellows, "greens": $greens, "teals": $teals, - "cyans": $cyans + "cyans": $cyans, + "black": $black, + "white": $white ) !default; diff --git a/scss/_root.scss b/scss/_root.scss index 8313d31c64..82f2e18639 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -12,8 +12,12 @@ :root, [data-bs-theme="light"] { @each $color-group-name, $color-group in $all-colors { - @each $color-name, $color-value in $color-group { - --#{$prefix}#{$color-name}: #{$color-value}; + @if type-of($color-group) == "map" { + @each $color-name, $color-value in $color-group { + --#{$prefix}#{$color-name}: #{$color-value}; + } + } @else { + --#{$prefix}#{$color-group-name}: #{$color-group}; } } diff --git a/site/data/sidebar.yml b/site/data/sidebar.yml index 59c4365441..f424749740 100644 --- a/site/data/sidebar.yml +++ b/site/data/sidebar.yml @@ -53,6 +53,7 @@ - title: Tables - title: Figures - title: Content body + - title: Forms icon: ui-radios icon_color: blue diff --git a/site/src/content/docs/layout/grid.mdx b/site/src/content/docs/layout/grid.mdx index 039b47934b..150237c6d2 100644 --- a/site/src/content/docs/layout/grid.mdx +++ b/site/src/content/docs/layout/grid.mdx @@ -2,7 +2,6 @@ title: CSS Grid description: Learn how to enable, use, and customize our alternate layout system built on CSS Grid with examples and code snippets. toc: true -added: "5.1" --- Bootstrap's default grid system represents the culmination of over a decade of CSS layout techniques, tried and tested by millions of people. But, it was also created without many of the modern CSS features and techniques we're seeing in browsers like the new CSS Grid. diff --git a/site/src/content/docs/layout/old-grid.mdx b/site/src/content/docs/layout/old-grid.mdx deleted file mode 100644 index 708a7bd637..0000000000 --- a/site/src/content/docs/layout/old-grid.mdx +++ /dev/null @@ -1,498 +0,0 @@ ---- -title: Grid system -description: Use our powerful mobile-first flexbox grid to build layouts of all shapes and sizes thanks to a twelve column system, six default responsive tiers, Sass variables and mixins, and dozens of predefined classes. -toc: true ---- - -## Example - -Bootstrap's grid system uses a series of containers, rows, and columns to layout and align content. It's built with [flexbox](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox) and is fully responsive. Below is an example and an in-depth explanation for how the grid system comes together. - - -**New to or unfamiliar with flexbox?** [Read this CSS Tricks flexbox guide](https://css-tricks.com/snippets/css/a-guide-to-flexbox/#flexbox-background) for background, terminology, guidelines, and code snippets. - - - -
-
- Column -
-
- Column -
-
- Column -
-
-`} /> - -The above example creates three equal-width columns across all devices and viewports using our predefined grid classes. Those columns are centered in the page with the parent `.container`. - -## How it works - -Breaking it down, here's how the grid system comes together: - -- **Our grid supports [six responsive breakpoints]([[docsref:/layout/breakpoints]]).** Breakpoints are based on `min-width` media queries, meaning they affect that breakpoint and all those above it (e.g., `.col-sm-4` applies to `sm`, `md`, `lg`, `xl`, and `2xl`). This means you can control container and column sizing and behavior by each breakpoint. - -- **Containers center and horizontally pad your content.** Use `.container` for a responsive pixel width, `.container-fluid` for `width: 100%` across all viewports and devices, or a responsive container (e.g., `.container-md`) for a combination of fluid and pixel widths. - -- **Rows are wrappers for columns.** Each column has horizontal `padding` (called a gutter) for controlling the space between them. This `padding` is then counteracted on the rows with negative margins to ensure the content in your columns is visually aligned down the left side. Rows also support modifier classes to [uniformly apply column sizing](#row-columns) and [gutter classes]([[docsref:/layout/gutters]]) to change the spacing of your content. - -- **Columns are incredibly flexible.** There are 12 template columns available per row, allowing you to create different combinations of elements that span any number of columns. Column classes indicate the number of template columns to span (e.g., `col-4` spans four). `width`s are set in percentages so you always have the same relative sizing. - -- **Gutters are also responsive and customizable.** [Gutter classes are available]([[docsref:/layout/gutters]]) across all breakpoints, with all the same sizes as our [margin and padding spacing]([[docsref:/utilities/spacing]]). Change horizontal gutters with `.gx-*` classes, vertical gutters with `.gy-*`, or all gutters with `.g-*` classes. `.g-0` is also available to remove gutters. - -- **Sass variables, maps, and mixins power the grid.** If you don't want to use the predefined grid classes in Bootstrap, you can use our [grid's source Sass](#css) to create your own with more semantic markup. We also include some CSS custom properties to consume these Sass variables for even greater flexibility for you. - -Be aware of the limitations and [bugs around flexbox](https://github.com/philipwalton/flexbugs), like the [inability to use some HTML elements as flex containers](https://github.com/philipwalton/flexbugs#flexbug-9). - -## Grid options - -Bootstrap's grid system can adapt across all six default breakpoints, and any breakpoints you customize. The six default grid tiers are as follows: - -- Extra small (xs) -- Small (sm) -- Medium (md) -- Large (lg) -- Extra large (xl) -- Extra extra large (2xl) - -As noted above, each of these breakpoints have their own container, unique class prefix, and modifiers. Here's how the grid changes across these breakpoints: - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- xs
- <576px - 		- sm
- ≥576px - 		- md
- ≥768px - 		- lg
- ≥992px - 		- xl
- ≥1200px - 		- 2xl
- ≥1400px -
Container max-widthNone (auto)540px720px960px1140px1320px
Class prefix.col-.col-sm-.col-md-.col-lg-.col-xl-.col-2xl-
# of columns12
Gutter width1.5rem (.75rem on left and right)
Custom guttersYes
NestableYes
Column orderingYes
-
- -## Auto-layout columns - -Utilize breakpoint-specific column classes for easy column sizing without an explicit numbered class like `.col-sm-6`. - -### Equal-width - -For example, here are two grid layouts that apply to every device and viewport, from `xs` to `2xl`. Add any number of unit-less classes for each breakpoint you need and every column will be the same width. - - -
-
- 1 of 2 -
-
- 2 of 2 -
-
-
-
- 1 of 3 -
-
- 2 of 3 -
-
- 3 of 3 -
-
-`} /> - -### Setting one column width - -Auto-layout for flexbox grid columns also means you can set the width of one column and have the sibling columns automatically resize around it. You may use predefined grid classes (as shown below), grid mixins, or inline widths. Note that the other columns will resize no matter the width of the center column. - - -
-
- 1 of 3 -
-
- 2 of 3 (wider) -
-
- 3 of 3 -
-
-
-
- 1 of 3 -
-
- 2 of 3 (wider) -
-
- 3 of 3 -
-
-`} /> - -### Variable width content - -Use `col-{breakpoint}-auto` classes to size columns based on the natural width of their content. - - -
-
- 1 of 3 -
-
- Variable width content -
-
- 3 of 3 -
-
-
-
- 1 of 3 -
-
- Variable width content -
-
- 3 of 3 -
-
-`} /> - -## Responsive classes - -Bootstrap's grid includes six tiers of predefined classes for building complex responsive layouts. Customize the size of your columns on extra small, small, medium, large, or extra large devices however you see fit. - -### All breakpoints - -For grids that are the same from the smallest of devices to the largest, use the `.col` and `.col-*` classes. Specify a numbered class when you need a particularly sized column; otherwise, feel free to stick to `.col`. - - -
-
col
-
col
-
col
-
col
-
-
-
col-8
-
col-4
-
-`} /> - -### Stacked to horizontal - -Using a single set of `.col-sm-*` classes, you can create a basic grid system that starts out stacked and becomes horizontal at the small breakpoint (`sm`). - - -
-
col-sm-8
-
col-sm-4
-
-
-
col-sm
-
col-sm
-
col-sm
-
-`} /> - -### Mix and match - -Don't want your columns to simply stack in some grid tiers? Use a combination of different classes for each tier as needed. See the example below for a better idea of how it all works. - - - -
-
.col-md-8
-
.col-6 .col-md-4
-
- - -
-
.col-6 .col-md-4
-
.col-6 .col-md-4
-
.col-6 .col-md-4
-
- - -
-
.col-6
-
.col-6
-
-`} /> - -### Row columns - -Use the responsive `.row-cols-*` classes to quickly set the number of columns that best render your content and layout. Whereas normal `.col-*` classes apply to the individual columns (e.g., `.col-md-4`), the row columns classes are set on the parent `.row` as a shortcut. With `.row-cols-auto` you can give the columns their natural width. - -Use these row columns classes to quickly create basic grid layouts or to control your card layouts. - - -
-
Column
-
Column
-
Column
-
Column
-
-`} /> - - -
-
Column
-
Column
-
Column
-
Column
-
-`} /> - - -
-
Column
-
Column
-
Column
-
Column
-
-`} /> - - -
-
Column
-
Column
-
Column
-
Column
-
-`} /> - - -
-
Column
-
Column
-
Column
-
Column
-
-`} /> - - -
-
Column
-
Column
-
Column
-
Column
-
-`} /> - -You can also use the accompanying Sass mixin, `row-cols()`: - -```scss -.element { - // Three columns to start - @include row-cols(3); - - // Five columns from medium breakpoint up - @include media-breakpoint-up(md) { - @include row-cols(5); - } -} -``` - -## Nesting - -To nest your content with the default grid, add a new `.row` and set of `.col-sm-*` columns within an existing `.col-sm-*` column. Nested rows should include a set of columns that add up to 12 or fewer (it is not required that you use all 12 available columns). - - -
-
- Level 1: .col-sm-3 -
-
-
-
- Level 2: .col-8 .col-sm-6 -
-
- Level 2: .col-4 .col-sm-6 -
-
-
-
-`} /> - -## CSS - -When using Bootstrap's source Sass files, you have the option of using Sass variables and mixins to create custom, semantic, and responsive page layouts. Our predefined grid classes use these same variables and mixins to provide a whole suite of ready-to-use classes for fast responsive layouts. - -### Sass variables - -Variables and maps determine the number of columns, the gutter width, and the media query point at which to begin floating columns. We use these to generate the predefined grid classes documented above, as well as for the custom mixins listed below. - -```scss -$grid-columns: 12; -$grid-gutter-width: 1.5rem; -$grid-row-columns: 6; -``` - - - - - -### Sass mixins - -Mixins are used in conjunction with the grid variables to generate semantic CSS for individual grid columns. - -```scss -// Creates a wrapper for a series of columns -@include make-row(); - -// Make the element grid-ready (applying everything but the width) -@include make-col-ready(); - -// Without optional size values, the mixin will create equal columns (similar to using .col) -@include make-col(); -@include make-col($size, $columns: $grid-columns); - -// Offset with margins -@include make-col-offset($size, $columns: $grid-columns); -``` - -### Example usage - -You can modify the variables to your own custom values, or just use the mixins with their default values. Here's an example of using the default settings to create a two-column layout with a gap between. - -```scss -.example-container { - @include make-container(); - // Make sure to define this width after the mixin to override - // `width: 100%` generated by `make-container()` - width: 800px; -} - -.example-row { - @include make-row(); -} - -.example-content-main { - @include make-col-ready(); - - @include media-breakpoint-up(sm) { - @include make-col(6); - } - @include media-breakpoint-up(lg) { - @include make-col(8); - } -} - -.example-content-secondary { - @include make-col-ready(); - - @include media-breakpoint-up(sm) { - @include make-col(6); - } - @include media-breakpoint-up(lg) { - @include make-col(4); - } -} -``` - - -
-
Main content
-
Secondary content
-
-`} /> - -## Customizing the grid - -Using our built-in grid Sass variables and maps, it's possible to completely customize the predefined grid classes. Change the number of tiers, the media query dimensions, and the container widths—then recompile. - -### Columns and gutters - -The number of grid columns can be modified via Sass variables. `$grid-columns` is used to generate the widths (in percent) of each individual column while `$grid-gutter-width` sets the width for the column gutters. `$grid-row-columns` is used to set the maximum number of columns of `.row-cols-*`, any number over this limit is ignored. - -```scss -$grid-columns: 12 !default; -$grid-gutter-width: 1.5rem !default; -$grid-row-columns: 6 !default; -``` - -### Grid tiers - -Moving beyond the columns themselves, you may also customize the number of grid tiers. If you wanted just four grid tiers, you'd update the `$breakpoints` and `$container-max-widths` to something like this: - -```scss -$breakpoints: ( - xs: 0, - sm: 480px, - md: 768px, - lg: 1024px -); - -$container-max-widths: ( - sm: 420px, - md: 720px, - lg: 960px -); -``` - -When making any changes to the Sass variables or maps, you'll need to save your changes and recompile. Doing so will output a brand-new set of predefined grid classes for column widths, offsets, and ordering. Responsive visibility utilities will also be updated to use the custom breakpoints. Make sure to set grid values in `px` (not `rem`, `em`, or `%`). diff --git a/site/src/scss/_ads.scss b/site/src/scss/_ads.scss index cc56340969..1fbf484bab 100644 --- a/site/src/scss/_ads.scss +++ b/site/src/scss/_ads.scss @@ -1,3 +1,7 @@ +@use "../../../scss/layout/breakpoints" as *; +@use "../../../scss/vendor/rfs" as *; +@use "../../../scss/mixins/border-radius" as *; + // stylelint-disable declaration-no-important, selector-max-id // diff --git a/site/src/scss/_anchor.scss b/site/src/scss/_anchor.scss index 5bb39150b1..e44fc91de1 100644 --- a/site/src/scss/_anchor.scss +++ b/site/src/scss/_anchor.scss @@ -1,3 +1,6 @@ +@use "../../../scss/variables" as *; +@use "../../../scss/mixins/transition" as *; + .anchor-link { padding: 0 .175rem; font-weight: 400; diff --git a/site/src/scss/_clipboard-js.scss b/site/src/scss/_clipboard-js.scss index de709d09ba..a4c71c8ccf 100644 --- a/site/src/scss/_clipboard-js.scss +++ b/site/src/scss/_clipboard-js.scss @@ -1,3 +1,6 @@ +@use "../../../scss/layout/breakpoints" as *; +@use "../../../scss/mixins/border-radius" as *; + // clipboard.js // // JS-based `Copy` buttons for code snippets. diff --git a/site/src/scss/_colors.scss b/site/src/scss/_colors.scss index 0fd7a57d79..cf1177f31f 100644 --- a/site/src/scss/_colors.scss +++ b/site/src/scss/_colors.scss @@ -47,11 +47,18 @@ } // Generate all color variant classes using nested loops -@each $color-name, $color-variants in $all-colors { - @each $shade, $value in $color-variants { - .bd-#{$shade} { - color: color-contrast($value); - background-color: $value; +@each $color-name, $color-value in $all-colors { + @if type-of($color-value) == "map" { + @each $shade, $value in $color-value { + .bd-#{$shade} { + color: color-contrast($value); + background-color: $value; + } + } + } @else { + .bd-#{$color-name} { + color: color-contrast($color-value); + background-color: $color-value; } } } diff --git a/site/src/scss/_content.scss b/site/src/scss/_content.scss index 6700e9f4f2..fa6647edcb 100644 --- a/site/src/scss/_content.scss +++ b/site/src/scss/_content.scss @@ -1,3 +1,7 @@ +@use "../../../scss/colors" as *; +@use "../../../scss/vendor/rfs" as *; +@use "../../../scss/layout/breakpoints" as *; + // // Bootstrap docs content theming // diff --git a/site/src/scss/_masthead.scss b/site/src/scss/_masthead.scss index e17a3fbff8..94e8020a46 100644 --- a/site/src/scss/_masthead.scss +++ b/site/src/scss/_masthead.scss @@ -8,14 +8,14 @@ @use "../../../scss/mixins/color-mode" as *; .bd-masthead { - --bd-pink-rgb: #{to-rgb($pink)}; + --bd-pink: $pink; padding: 3rem 0; // stylelint-disable - background-image: linear-gradient(180deg, rgba(var(--bs-body-bg-rgb), .01), rgba(var(--bs-body-bg-rgb), 1) 85%), - radial-gradient(ellipse at top left, rgba(var(--bs-primary-rgb), .5), transparent 50%), - radial-gradient(ellipse at top right, rgba(var(--bd-accent-rgb), .5), transparent 50%), - radial-gradient(ellipse at center right, rgba(var(--bd-violet-rgb), .5), transparent 50%), - radial-gradient(ellipse at center left, rgba(var(--bd-pink-rgb), .5), transparent 50%); + background-image: linear-gradient(180deg, color-mix(in srgb, var(--bs-body-bg) 1%, transparent), color-mix(in srgb, var(--bs-body-bg) 85%, transparent)), + radial-gradient(ellipse at top left, color-mix(in srgb, var(--bs-primary) 50%, transparent), transparent 50%), + radial-gradient(ellipse at top right, color-mix(in srgb, var(--bd-accent) 50%, transparent), transparent 50%), + radial-gradient(ellipse at center right, color-mix(in srgb, var(--bd-violet) 50%, transparent), transparent 50%), + radial-gradient(ellipse at center left, color-mix(in srgb, var(--bd-pink) 50%, transparent), transparent 50%); // stylelint-enable h1 { diff --git a/site/src/scss/_navbar.scss b/site/src/scss/_navbar.scss index f5603e423c..3789bcb740 100644 --- a/site/src/scss/_navbar.scss +++ b/site/src/scss/_navbar.scss @@ -4,6 +4,7 @@ @use "../../../scss/mixins" as *; @use "../../../scss/variables" as *; @use "../../../scss/layout/breakpoints" as *; +@use "../../../scss/vendor/rfs" as *; .bd-navbar { padding: .75rem 0; diff --git a/site/src/scss/_placeholder-img.scss b/site/src/scss/_placeholder-img.scss index 6f5bbe4189..15d4fce486 100644 --- a/site/src/scss/_placeholder-img.scss +++ b/site/src/scss/_placeholder-img.scss @@ -1,3 +1,4 @@ +@use "../../../scss/vendor/rfs" as *; // // Placeholder svg used in the docs. // diff --git a/site/src/scss/_search.scss b/site/src/scss/_search.scss index 592d65f98f..0e4769ed9e 100644 --- a/site/src/scss/_search.scss +++ b/site/src/scss/_search.scss @@ -1,3 +1,9 @@ +@use "variables" as *; +@use "../../../scss/colors" as *; +@use "../../../scss/layout/breakpoints" as *; +@use "../../../scss/mixins/color-mode" as *; +@use "../../../scss/mixins/border-radius" as *; + // stylelint-disable selector-class-pattern :root { diff --git a/site/src/scss/_sidebar.scss b/site/src/scss/_sidebar.scss index 089215c69a..b92e706370 100644 --- a/site/src/scss/_sidebar.scss +++ b/site/src/scss/_sidebar.scss @@ -1,3 +1,7 @@ +@use "../../../scss/variables" as *; +@use "../../../scss/layout/breakpoints" as *; +@use "../../../scss/mixins/box-shadow" as *; + .bd-sidebar { @include media-breakpoint-up(lg) { position: sticky; @@ -15,7 +19,7 @@ @include media-breakpoint-down(lg) { .offcanvas-lg { border-right-color: var(--bs-border-color); - box-shadow: $box-shadow-lg; + box-shadow: var(--bs-box-shadow-lg); } } } diff --git a/site/src/scss/_toc.scss b/site/src/scss/_toc.scss index 6dfaf1da60..889f999d9e 100644 --- a/site/src/scss/_toc.scss +++ b/site/src/scss/_toc.scss @@ -1,3 +1,6 @@ +@use "../../../scss/layout/breakpoints" as *; +@use "../../../scss/vendor/rfs" as *; +@use "../../../scss/mixins/border-radius" as *; // stylelint-disable selector-max-type, selector-no-qualifying-type .bd-toc { diff --git a/site/src/scss/_variables.scss b/site/src/scss/_variables.scss index 6b6002f62d..e6cf3742b0 100644 --- a/site/src/scss/_variables.scss +++ b/site/src/scss/_variables.scss @@ -1,6 +1,7 @@ @use "../../../scss/config" as *; @use "../../../scss/colors" as *; @use "../../../scss/functions" as *; +@use "../../../scss/mixins/color-mode" as *; // Local docs variables $bd-purple: #4c0bce; diff --git a/site/src/scss/docs.scss b/site/src/scss/docs.scss index cf1b098eee..9758ad40a9 100644 --- a/site/src/scss/docs.scss +++ b/site/src/scss/docs.scss @@ -22,20 +22,6 @@ // // Happy Bootstrapping! -// Load Bootstrap variables and mixins -// @use "../../../scss/config"; -// @use "../../../scss/colors"; -// @use "../../../scss/functions"; -// @use "../../../scss/mixins"; -// @use "../../../scss/variables"; -@use "../../../scss/layout/breakpoints" as *; - -// // fusv-disable -// $enable-grid-classes: false; -// $enable-cssgrid: true; -// // fusv-enable -// @use "../../../scss/layout/"; - // Load docs components @use "variables"; @use "navbar"; diff --git a/site/src/scss/docs_search.scss b/site/src/scss/docs_search.scss index 7950acc883..fe93fd8ec4 100644 --- a/site/src/scss/docs_search.scss +++ b/site/src/scss/docs_search.scss @@ -5,14 +5,13 @@ * For details, see https://creativecommons.org/licenses/by/3.0/. */ -@import "../../../scss/config"; -@import "../../../scss/colors"; -@import "../../../scss/functions"; -@import "../../../scss/mixins"; -@import "../../../scss/variables"; -@import "../../../scss/layout/breakpoints"; -@import "variables"; - -@import "@docsearch/css/dist/style"; -@import "search"; - \ No newline at end of file +// @import "../../../scss/config"; +// @import "../../../scss/colors"; +// @import "../../../scss/functions"; +// @import "../../../scss/mixins"; +// @import "../../../scss/variables"; +// @import "../../../scss/layout/breakpoints"; +// @use "variables" as *; + +@use "@docsearch/css/dist/style" as *; +@use "search" as *;