From 8cdb6c40bdf55229459f479111e6a44d49052cf1 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 14 Dec 2021 09:51:31 +0200
Subject: Update stylelint and stylelint-config-twbs-bootstrap (#35438)

---
 scss/_utilities.scss | 2 --
 1 file changed, 2 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 960d6f1ad..6498349b2 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -1,5 +1,3 @@
-// stylelint-disable indentation
-
 // Utilities
 
 $utilities: () !default;
-- 
cgit v1.2.3


From 43a9216a7fa90e0e427f9217b89d455019f2ad77 Mon Sep 17 00:00:00 2001
From: Ty Mick <ty@tymick.me>
Date: Sun, 12 Dec 2021 09:19:19 -0800
Subject: Move `gap` utility API from "Flex" to "Spacing"

The `gap` utility is described on the [Spacing page][1] but is not
actually mentioned on the [Flex page][2] (apart from the [API
section][3]).

[1]: https://getbootstrap.com/docs/5.1/utilities/spacing/
[2]: https://getbootstrap.com/docs/5.1/utilities/flex/
[3]: https://getbootstrap.com/docs/5.1/utilities/flex/#utilities-api
---
 scss/_utilities.scss | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 6498349b2..4d65bb88b 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -236,12 +236,6 @@ $utilities: map-merge(
       class: flex,
       values: wrap nowrap wrap-reverse
     ),
-    "gap": (
-      responsive: true,
-      property: gap,
-      class: gap,
-      values: $spacers
-    ),
     "justify-content": (
       responsive: true,
       property: justify-content,
@@ -434,6 +428,13 @@ $utilities: map-merge(
       class: ps,
       values: $spacers
     ),
+    // Gap utility
+    "gap": (
+      responsive: true,
+      property: gap,
+      class: gap,
+      values: $spacers
+    ),
     // scss-docs-end utils-spacing
     // Text
     // scss-docs-start utils-text
-- 
cgit v1.2.3


From de0dfca9a1749990319cdfcbb7f1584df09d7091 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 29 Nov 2021 21:14:17 -0800
Subject: Convert border utilities to CSS variables

- Updates the utilities mixin to check for specific CSS variable names via `css-variable`
- Bonus fix: we now prevent local variables for `0` value utilities (e.g., `.border-top-0` no longer sets `--bs-border-opacity: 1`
- Adds new `.border-opacity-*` classes
- Adds new root variables: `--bs-border-color`, `--bs-border-style`, `--bs-border-width`
- Documents the new variable changes
---
 scss/_utilities.scss | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 4d65bb88b..7fc732acf 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -98,15 +98,29 @@ $utilities: map-merge(
     // scss-docs-start utils-borders
     "border": (
       property: border,
+      local-vars: (
+        "border-opacity": 1
+      ),
       values: (
-        null: $border-width solid $border-color,
+        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
         0: 0,
       )
     ),
+    "border-opacity": (
+      css-var: true,
+      class: border-opacity,
+      values: (
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      )
+    ),
     "border-top": (
       property: border-top,
       values: (
-        null: $border-width solid $border-color,
+        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
         0: 0,
       )
     ),
@@ -114,14 +128,14 @@ $utilities: map-merge(
       property: border-right,
       class: border-end,
       values: (
-        null: $border-width solid $border-color,
+        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
         0: 0,
       )
     ),
     "border-bottom": (
       property: border-bottom,
       values: (
-        null: $border-width solid $border-color,
+        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
         0: 0,
       )
     ),
@@ -129,17 +143,18 @@ $utilities: map-merge(
       property: border-left,
       class: border-start,
       values: (
-        null: $border-width solid $border-color,
+        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
         0: 0,
       )
     ),
     "border-color": (
-      property: border-color,
+      css-var: true,
+      css-variable-name: border-color,
       class: border,
-      values: map-merge($theme-colors, ("white": $white))
+      values: $utilities-border-colors
     ),
     "border-width": (
-      property: border-width,
+      css-var: true,
       class: border,
       values: $border-widths
     ),
-- 
cgit v1.2.3


From a9b34450601b017b27cacd9ff750aa9c12aac82c Mon Sep 17 00:00:00 2001
From: cccabinet <chay84@hotmail.com>
Date: Tue, 1 Mar 2022 23:43:33 +0900
Subject: fix:border-width

---
 scss/_utilities.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 7fc732acf..771dd4225 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -155,6 +155,7 @@ $utilities: map-merge(
     ),
     "border-width": (
       css-var: true,
+      css-variable-name: border-width,
       class: border,
       values: $border-widths
     ),
-- 
cgit v1.2.3


From c73480c63660d0643434e07c9a522758c21a272d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 28 Feb 2022 17:22:14 -0800
Subject: Adjust border-radius values and add some new utilities

- Updates global border-radius values for a more modern appearance
- New .fw-semibold
- New .rounded-4 and .rounded-5
---
 scss/_utilities.scss | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 771dd4225..49fac6508 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -478,6 +478,7 @@ $utilities: map-merge(
         lighter: $font-weight-lighter,
         normal: $font-weight-normal,
         bold: $font-weight-bold,
+        semibold: $font-weight-semibold,
         bolder: $font-weight-bolder
       )
     ),
@@ -605,6 +606,8 @@ $utilities: map-merge(
         1: $border-radius-sm,
         2: $border-radius,
         3: $border-radius-lg,
+        4: $border-radius-xl,
+        5: $border-radius-2xl,
         circle: 50%,
         pill: $border-radius-pill
       )
-- 
cgit v1.2.3


From acf6ea74a74328bcaa9f1c354f27e602cfbb8968 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 13 Mar 2022 10:13:09 -0700
Subject: Add additional root variables, rename `$variable-prefix` to `$prefix`
 (#35981)

* Add additional root variables, rename $variable-prefix to $prefix

- Adds new root CSS variables for border-radius, border-width, border-color, and border-style
- Adds new root CSS variables for heading-color, link-colors, code color, and highlight color
- Replaces most instances of Sass variables (for border-radius, border-color, border-style, and border-width) for CSS variables inside _variables.scss
- Updates $mark-padding to be an even pixel number
- Renames $variable-prefix to $prefix throughout

* Bundlewatch
---
 scss/_utilities.scss | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 49fac6508..3705f92ab 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -102,7 +102,7 @@ $utilities: map-merge(
         "border-opacity": 1
       ),
       values: (
-        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
+        null: var(--#{$prefix}border-width) var(--#{$prefix}border-style) var(--#{$prefix}border-color),
         0: 0,
       )
     ),
@@ -120,7 +120,7 @@ $utilities: map-merge(
     "border-top": (
       property: border-top,
       values: (
-        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
+        null: var(--#{$prefix}border-width) var(--#{$prefix}border-style) var(--#{$prefix}border-color),
         0: 0,
       )
     ),
@@ -128,14 +128,14 @@ $utilities: map-merge(
       property: border-right,
       class: border-end,
       values: (
-        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
+        null: var(--#{$prefix}border-width) var(--#{$prefix}border-style) var(--#{$prefix}border-color),
         0: 0,
       )
     ),
     "border-bottom": (
       property: border-bottom,
       values: (
-        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
+        null: var(--#{$prefix}border-width) var(--#{$prefix}border-style) var(--#{$prefix}border-color),
         0: 0,
       )
     ),
@@ -143,7 +143,7 @@ $utilities: map-merge(
       property: border-left,
       class: border-start,
       values: (
-        null: var(--#{$variable-prefix}border-width) var(--#{$variable-prefix}border-style) var(--#{$variable-prefix}border-color),
+        null: var(--#{$prefix}border-width) var(--#{$prefix}border-style) var(--#{$prefix}border-color),
         0: 0,
       )
     ),
@@ -457,7 +457,7 @@ $utilities: map-merge(
     "font-family": (
       property: font-family,
       class: font,
-      values: (monospace: var(--#{$variable-prefix}font-monospace))
+      values: (monospace: var(--#{$prefix}font-monospace))
     ),
     "font-size": (
       rfs: true,
@@ -583,7 +583,7 @@ $utilities: map-merge(
     "gradient": (
       property: background-image,
       class: bg,
-      values: (gradient: var(--#{$variable-prefix}gradient))
+      values: (gradient: var(--#{$prefix}gradient))
     ),
     // scss-docs-start utils-interaction
     "user-select": (
@@ -601,36 +601,36 @@ $utilities: map-merge(
       property: border-radius,
       class: rounded,
       values: (
-        null: $border-radius,
+        null: var(--#{$prefix}border-radius),
         0: 0,
-        1: $border-radius-sm,
-        2: $border-radius,
-        3: $border-radius-lg,
-        4: $border-radius-xl,
-        5: $border-radius-2xl,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-2xl),
         circle: 50%,
-        pill: $border-radius-pill
+        pill: var(--#{$prefix}border-radius-pill)
       )
     ),
     "rounded-top": (
       property: border-top-left-radius border-top-right-radius,
       class: rounded-top,
-      values: (null: $border-radius)
+      values: (null: var(--#{$prefix}border-radius))
     ),
     "rounded-end": (
       property: border-top-right-radius border-bottom-right-radius,
       class: rounded-end,
-      values: (null: $border-radius)
+      values: (null: var(--#{$prefix}border-radius))
     ),
     "rounded-bottom": (
       property: border-bottom-right-radius border-bottom-left-radius,
       class: rounded-bottom,
-      values: (null: $border-radius)
+      values: (null: var(--#{$prefix}border-radius))
     ),
     "rounded-start": (
       property: border-bottom-left-radius border-top-left-radius,
       class: rounded-start,
-      values: (null: $border-radius)
+      values: (null: var(--#{$prefix}border-radius))
     ),
     // scss-docs-end utils-border-radius
     // scss-docs-start utils-visibility
-- 
cgit v1.2.3


From dab026fc2bb43aff8d16033143d1bf0d71198277 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 6 Apr 2022 17:35:31 -0700
Subject: Revert border-color utilities to use the CSS property instead of the
 variable

---
 scss/_utilities.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 3705f92ab..9e6052909 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -148,8 +148,7 @@ $utilities: map-merge(
       )
     ),
     "border-color": (
-      css-var: true,
-      css-variable-name: border-color,
+      property: border-color,
       class: border,
       values: $utilities-border-colors
     ),
-- 
cgit v1.2.3


From bca99232b8bef6a53719e4827de40729098d4ec8 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 5 May 2022 21:32:02 -0700
Subject: Iterate on border utilities (#36239)

* Remove `--bs-border-opacity: 1` from `.border-*` utilities

We set `--bs-border-opacity: 1` globally at the `:root` level, so redeclaring it on every `.border-*` utility doesn't make much sense. I think we can drop this.

* Remove global border-opacity var, restore on .border-color classes, move .border-color utils down the list to fix some specificity issues

* Add some demos of border utils to the docs
---
 scss/_utilities.scss | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 9e6052909..1e0d141ac 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -98,25 +98,11 @@ $utilities: map-merge(
     // scss-docs-start utils-borders
     "border": (
       property: border,
-      local-vars: (
-        "border-opacity": 1
-      ),
       values: (
         null: var(--#{$prefix}border-width) var(--#{$prefix}border-style) var(--#{$prefix}border-color),
         0: 0,
       )
     ),
-    "border-opacity": (
-      css-var: true,
-      class: border-opacity,
-      values: (
-        10: .1,
-        25: .25,
-        50: .5,
-        75: .75,
-        100: 1
-      )
-    ),
     "border-top": (
       property: border-top,
       values: (
@@ -150,6 +136,9 @@ $utilities: map-merge(
     "border-color": (
       property: border-color,
       class: border,
+      local-vars: (
+        "border-opacity": 1
+      ),
       values: $utilities-border-colors
     ),
     "border-width": (
@@ -158,6 +147,17 @@ $utilities: map-merge(
       class: border,
       values: $border-widths
     ),
+    "border-opacity": (
+      css-var: true,
+      class: border-opacity,
+      values: (
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      )
+    ),
     // scss-docs-end utils-borders
     // Sizing utilities
     // scss-docs-start utils-sizing
-- 
cgit v1.2.3


From 9a582767c605d9b9a407a64e07225b016803d47c Mon Sep 17 00:00:00 2001
From: maks <pine3ree@gmail.com>
Date: Mon, 3 Oct 2022 19:52:02 +0200
Subject: add font-weight-medium(=500) / fw-medium (#36781)

* add font-weight-medium = 500

* Update _utilities.scss
---
 scss/_utilities.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 1e0d141ac..e23d6a7e4 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -473,11 +473,12 @@ $utilities: map-merge(
       property: font-weight,
       class: fw,
       values: (
-        light: $font-weight-light,
         lighter: $font-weight-lighter,
+        light: $font-weight-light,
         normal: $font-weight-normal,
-        bold: $font-weight-bold,
+        medium: $font-weight-medium,
         semibold: $font-weight-semibold,
+        bold: $font-weight-bold,
         bolder: $font-weight-bolder
       )
     ),
-- 
cgit v1.2.3


From b1185b91ea56e4a7b431b869855d898c91e4763b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <julien.deramond@orange.com>
Date: Mon, 3 Oct 2022 20:52:41 +0200
Subject: Add new border-radius utilities (#36540)

* Add new border-radius utilities

* Fix bundlewatch

* Fix bundlewatch again

Co-authored-by: Mark Otto <markdotto@gmail.com>
---
 scss/_utilities.scss | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index e23d6a7e4..715c611c2 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -615,22 +615,62 @@ $utilities: map-merge(
     "rounded-top": (
       property: border-top-left-radius border-top-right-radius,
       class: rounded-top,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-2xl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
     ),
     "rounded-end": (
       property: border-top-right-radius border-bottom-right-radius,
       class: rounded-end,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-2xl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
     ),
     "rounded-bottom": (
       property: border-bottom-right-radius border-bottom-left-radius,
       class: rounded-bottom,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-2xl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
     ),
     "rounded-start": (
       property: border-bottom-left-radius border-top-left-radius,
       class: rounded-start,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-2xl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
     ),
     // scss-docs-end utils-border-radius
     // scss-docs-start utils-visibility
-- 
cgit v1.2.3


From 708a3a0e398f6c01f00283941cd6a4aca9f66322 Mon Sep 17 00:00:00 2001
From: Daniel Raymond <29353783+MadeByRaymond@users.noreply.github.com>
Date: Thu, 6 Oct 2022 21:14:11 +0100
Subject: Utilities for overflow and object fit (#36848)

* Added "overflow-x" and "overflow-y"

- Having the same properties as overflow but for just the x and y axises
- Usecase being I want my y axis to be scrollable but not my x axis
- E.g a card with a vertical list of items.

* Added "object-fit" utilities

- The CSS object-fit property is used to specify how an <img> or <video> should be resized to fit its container.
- A responsive alternative to using background-img for a resizable fill/fit image.

* Updated documantation for the overflow utilities

- Now includes docs for `overflow-x` and `overflow-y` utilities

* Placeholder shortcode updated

- Can now choose to render an img tag or svg
- The image contains a base64 svg generated within the template
- example shortcode updated to detect, replace and render preview of 'img' tags as well

* New documentaion for Object Fit added

- Documentation added for the 'object-fit' util

* Updated spell checks issues

* Update object-fit.md

* Update overflow.md

* Update object-fit.md

* Updated markup to address HTML Validation Errors

- error: Bad value  for attribute "src" on element "img": Illegal character in scheme data: space is not allowed.
- info warning: Self-closing tag syntax in text/html documents is widely discouraged; it's unnecessary and interacts badly with other HTML features (e.g., unquoted attribute values). If you're using a tool that injects self-closing tag syntax into all void elements, without any option to prevent it from doing so, then consider switching to a different tool.

* Updated Fix

- Added Legibility to the img markup (example.html)
- Fixed issue with example not working properly (because image closing tag no longer has "/>" )

* update values by step of 0.25 in bundlewatch.config

The following values in .bundlewatch.config.json have been updated:
- ./dist/css/bootstrap-utilities.css
- ./dist/css/bootstrap-utilities.min.css
- ./dist/css/bootstrap.css
- ./dist/css/bootstrap.min.css

Co-authored-by: Daniel O <dobiekwe@byteworks.com.ng>
Co-authored-by: Mark Otto <otto@github.com>
---
 scss/_utilities.scss | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 715c611c2..7a597046b 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -22,6 +22,20 @@ $utilities: map-merge(
       )
     ),
     // scss-docs-end utils-float
+    // Object Fit utilities
+    // scss-docs-start utils-object-fit
+    "object-fit": (
+      responsive: true,
+      property: object-fit,
+      values: (
+        contain: contain,
+        cover: cover,
+        fill: fill,
+        scale: scale-down,
+        none: none,
+      )
+    ),
+    // scss-docs-end utils-object-fit
     // Opacity utilities
     // scss-docs-start utils-opacity
     "opacity": (
@@ -40,6 +54,14 @@ $utilities: map-merge(
       property: overflow,
       values: auto hidden visible scroll,
     ),
+    "overflow-x": (
+      property: overflow-x,
+      values: auto hidden visible scroll,
+    ),
+    "overflow-y": (
+      property: overflow-y,
+      values: auto hidden visible scroll,
+    ),
     // scss-docs-end utils-overflow
     // scss-docs-start utils-display
     "display": (
-- 
cgit v1.2.3


From 0968db80997613828634ddb4b2c3980871f0ed41 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 22 Oct 2022 17:13:39 -0400
Subject: Add `z-index` utilities, `.z-*` (#37317)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add z-index utilities, .z-*

* Fix missing comma in _utilities.scss

* Fix bundlewatch

* Fix lint

* Update site/content/docs/5.2/utilities/z-index.md

Co-authored-by: Julien Déramond <julien.deramond@orange.com>

* custom appearance

* linter

Co-authored-by: Julien Déramond <juderamond@gmail.com>
Co-authored-by: Julien Déramond <julien.deramond@orange.com>
---
 scss/_utilities.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 7a597046b..d69f89a98 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -703,8 +703,13 @@ $utilities: map-merge(
         visible: visible,
         invisible: hidden,
       )
-    )
+    ),
     // scss-docs-end utils-visibility
+    "z-index": (
+      property: z-index,
+      class: z,
+      values: $zindex-levels,
+    )
   ),
   $utilities
 );
-- 
cgit v1.2.3


From 5f67d38bb2f30f833519f205353ff6ba839fb40f Mon Sep 17 00:00:00 2001
From: Daniel Raymond <29353783+MadeByRaymond@users.noreply.github.com>
Date: Wed, 16 Nov 2022 03:51:44 +0100
Subject: Grid Gap Updates (#37413)

* Grid Gap Updates

- added column-gap
- added row-gap

* Grid Gap Updates

* Bundlewatch update

* Apply suggestions from code review

Co-authored-by: Daniel O <dobiekwe@byteworks.com.ng>
Co-authored-by: Mark Otto <otto@github.com>
Co-authored-by: Mark Otto <markd.otto@gmail.com>
---
 scss/_utilities.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index d69f89a98..a8c8b89a7 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -472,6 +472,18 @@ $utilities: map-merge(
       class: gap,
       values: $spacers
     ),
+    "row-gap": (
+      responsive: true,
+      property: row-gap,
+      class: row-gap,
+      values: $spacers
+    ),
+    "column-gap": (
+      responsive: true,
+      property: column-gap,
+      class: column-gap,
+      values: $spacers
+    ),
     // scss-docs-end utils-spacing
     // Text
     // scss-docs-start utils-text
-- 
cgit v1.2.3


From fc3f4b67d65c575daa661ecf31cf59b4ff3cced5 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 28 Nov 2022 22:30:26 -0800
Subject: Add dark mode support (#35857)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add dark mode to docs

* Minor fix: missing space indentation

* Minor fix: revert utilities/z-index added-in modification

* Remove prev: and next: from doc because extracted to another PR

* Use .bg-body-tertiary in all Utilities > Overflow examples

* fix example

* Fix up spacing examples

* Update box-shadow Sass variables and utilities to auto-adjust to color modes

* Remove unused docs class

* Refactor form styles to use CSS variable for background images on .form-check and .form-switch

* Fix docs selector

* Rename shortcut for clarity

* Heading consistency

* Reintroduce missing 4th grid item in Utilities > Spacing example

* Fix bundlewatch

* .bd-callout* rendering is OK so removing comments in the code

* Update scss/_utilities.scss

Co-authored-by: Julien Déramond <julien.deramond@orange.com>

* Fix gutters example styling

* Fix text colors on background utils docs

* redesign and fix up position marker example, which doesn't show nicely in darkmode but at least isn't broken

* fix some color utils examples

* Deprecate mixin notice

* Deprecate notice for list-group-item-variant() mixin

* Revamp new link CSS vars

* Use map-keys in some each Sass files

* Remove list-group-item-variant mixin ref in sass loop desc

* Display CSS vars scoped to our built-in dark mode

* Revert previous commit

* Fix list group variant link

* Fix typo

* Remove imports of alert/list-group mixins in scss/_mixins.scss

* Small formatting + comments removal in scss/_content.scss

* Fix alert links colors

* fix dropdown border-radius mixin

* fix link color and underline again, this time using CSS var override for color var and fallback value for the underline

* fix colors on docs navbar for dark mode

* remove two changes

* missing ref

* another link underline fix, just use sass vars for link decoration for now

* missing color bg docs, plus move dropdown override to scss

* more changes from review

* fix some examples, drop unused docs navbar styles, update docs navbar color mode to use mixin

* Few fixes around type

- Restored CSS variable for color on headings, this time with a fallback value
- In conjunction, restored and wrapped the default CSS var with a null value check
- Split headings and paragraphs docs in Reboot, elaborated on them

* Restyle custom details > summary element in docs

* Rewrite some migration docs

* fix form checks

* Fix up some navbar styling, tweak docs callout

* Fix select images, mostly for validation styling

* Clean up some migration notes, document some new form control CSS vars, mention new variables-dark in sass docs

* Update site/content/docs/5.2/components/scrollspy.md

Co-authored-by: Julien Déramond <julien.deramond@orange.com>

* Apply suggestions from code review

Co-authored-by: Julien Déramond <julien.deramond@orange.com>

* mention form control css vars in migration guide

* Tweak grid and flex docs background examples

* clarify some docs

* fix some more things

Co-authored-by: Julien Déramond <juderamond@gmail.com>
Co-authored-by: Julien Déramond <julien.deramond@orange.com>
---
 scss/_utilities.scss | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index a8c8b89a7..4c2c39dd7 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -163,6 +163,11 @@ $utilities: map-merge(
       ),
       values: $utilities-border-colors
     ),
+    "subtle-border-color": (
+      property: border-color,
+      class: border,
+      values: $utilities-border-subtle
+    ),
     "border-width": (
       css-var: true,
       css-variable-name: border-width,
@@ -570,9 +575,12 @@ $utilities: map-merge(
       values: map-merge(
         $utilities-text-colors,
         (
-          "muted": $text-muted,
+          "muted": $text-muted, // deprecated
           "black-50": rgba($black, .5), // deprecated
           "white-50": rgba($white, .5), // deprecated
+          "body-secondary": var(--#{$prefix}secondary-color),
+          "body-tertiary": var(--#{$prefix}tertiary-color),
+          "body-emphasis": var(--#{$prefix}emphasis-color),
           "reset": inherit,
         )
       )
@@ -587,6 +595,11 @@ $utilities: map-merge(
         100: 1
       )
     ),
+    "text-color": (
+      property: color,
+      class: text,
+      values: $utilities-text-emphasis-colors
+    ),
     // scss-docs-end utils-color
     // scss-docs-start utils-bg-color
     "background-color": (
@@ -598,7 +611,10 @@ $utilities: map-merge(
       values: map-merge(
         $utilities-bg-colors,
         (
-          "transparent": transparent
+          "transparent": transparent,
+          "body-secondary": rgba(var(--#{$prefix}secondary-bg-rgb), var(--#{$prefix}bg-opacity)),
+          "body-tertiary": rgba(var(--#{$prefix}tertiary-bg-rgb), var(--#{$prefix}bg-opacity)),
+          "body-emphasis": rgba(var(--#{$prefix}emphasis-bg-rgb), var(--#{$prefix}bg-opacity)),
         )
       )
     ),
@@ -613,6 +629,11 @@ $utilities: map-merge(
         100: 1
       )
     ),
+    "subtle-background-color": (
+      property: background-color,
+      class: bg,
+      values: $utilities-bg-subtle
+    ),
     // scss-docs-end utils-bg-color
     "gradient": (
       property: background-image,
-- 
cgit v1.2.3


From 9e17b2b34cdec9dce063bba09b01aa9a63e7dd94 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 29 Dec 2022 14:19:22 -0800
Subject: Focus ring helper and utilities (#33125)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add global variables for box-shadow focus rings

* Update instances of -btn-focus-box-shadow to use -ring-box-shadow, unless it's for buttons or inputs

* fix variable name

* Add CSS variables for global focus styling, document it

* Move to CSS vars section

* Update scss/_nav.scss

Co-authored-by: Gaël Poupard <ffoodd@users.noreply.github.com>

* Helper and utils

* Fix bundlewatch

* Change 'Focus ring' in sidebar so that the page can be visible

* Minor typo fix

* fix merge

* Revamp some more, improve docs

Co-authored-by: Gaël Poupard <ffoodd@users.noreply.github.com>
Co-authored-by: Julien Déramond <juderamond@gmail.com>
Co-authored-by: Patrick H. Lauke <redux@splintered.co.uk>
---
 scss/_utilities.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 4c2c39dd7..5134688e9 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -84,6 +84,14 @@ $utilities: map-merge(
       )
     ),
     // scss-docs-end utils-shadow
+    // scss-docs-start utils-focus-ring
+    "focus-ring": (
+      css-var: true,
+      css-variable-name: focus-ring-color,
+      class: focus-ring,
+      values: map-loop($theme-colors-rgb, rgba-css-var, "$key", "focus-ring")
+    ),
+    // scss-docs-end utils-focus-ring
     // scss-docs-start utils-position
     "position": (
       property: position,
-- 
cgit v1.2.3


From d70b5db2e0aee9ea9a7255d28395278876bf53ba Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 3 Jan 2023 22:23:46 -0800
Subject: Add new link utilities, icon link helper, and update colored link
 helpers (#37762)

* Add new link utilities, update colored link helpers

* Remove commented out code

* Fixes

* Remove examples changes

* Fixes and copy

* Fix icon-link instances on homepage

* Bump bundlewatch

* Fix node-sass issue for rgba() function bug

* More bundlewatch

* One more time after merge

* Add callout for a11y

* Hover and focus-visible

* Add a11y callouts

* Remove duplicate for now

* More code review feedback
---
 scss/_utilities.scss | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 5134688e9..d017d117f 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -609,6 +609,56 @@ $utilities: map-merge(
       values: $utilities-text-emphasis-colors
     ),
     // scss-docs-end utils-color
+    // scss-docs-start utils-links
+    "link-opacity": (
+      css-var: true,
+      class: link-opacity,
+      state: hover,
+      values: (
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      )
+    ),
+    "link-offset": (
+      property: text-underline-offset,
+      class: link-offset,
+      state: hover,
+      values: (
+        1: .125em,
+        2: .25em,
+        3: .375em,
+      )
+    ),
+    "link-underline": (
+      // css-var: true,
+      property: text-decoration-color,
+      class: link-underline,
+      local-vars: (
+        "link-underline-opacity": 1
+      ),
+      values: map-merge(
+        $utilities-links-underline,
+        (
+          null: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-underline-opacity, 1)),
+        )
+      )
+    ),
+    "link-underline-opacity": (
+      css-var: true,
+      class: link-underline-opacity,
+      state: hover,
+      values: (
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      ),
+    ),
+    // scss-docs-end utils-links
     // scss-docs-start utils-bg-color
     "background-color": (
       property: background-color,
-- 
cgit v1.2.3


From fd1ec97bd3fdc5b942f4fff60c6764e3e13db2a8 Mon Sep 17 00:00:00 2001
From: Louis-Maxime Piton <louismaxime.piton@orange.com>
Date: Fri, 6 Jan 2023 04:59:59 +0100
Subject: Docs: Small enhancements (#37803)

* Consistency with the doc

* Bring a class to avoid weird behavior

* Consistency + Add some explaining text

* fix(color)
---
 scss/_utilities.scss | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index d017d117f..601ce39e0 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -796,11 +796,13 @@ $utilities: map-merge(
       )
     ),
     // scss-docs-end utils-visibility
+    // scss-docs-start utils-zindex
     "z-index": (
       property: z-index,
       class: z,
       values: $zindex-levels,
     )
+    // scss-docs-end utils-zindex
   ),
   $utilities
 );
-- 
cgit v1.2.3


From ffbe6e9246767b997d9d8d8fbe454aa8f4315d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <juderamond@gmail.com>
Date: Fri, 6 Jan 2023 20:41:28 +0100
Subject: Drop unused `.bg-body-emphasis` (#37824)

---
 scss/_utilities.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 601ce39e0..10bd5c8bf 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -672,7 +672,6 @@ $utilities: map-merge(
           "transparent": transparent,
           "body-secondary": rgba(var(--#{$prefix}secondary-bg-rgb), var(--#{$prefix}bg-opacity)),
           "body-tertiary": rgba(var(--#{$prefix}tertiary-bg-rgb), var(--#{$prefix}bg-opacity)),
-          "body-emphasis": rgba(var(--#{$prefix}emphasis-bg-rgb), var(--#{$prefix}bg-opacity)),
         )
       )
     ),
-- 
cgit v1.2.3


From 8265927fc1dc5fd18c13d04d623f00a77590e4e0 Mon Sep 17 00:00:00 2001
From: Louis-Maxime Piton <louismaxime.piton@orange.com>
Date: Fri, 6 Jan 2023 20:46:03 +0100
Subject: CSS: rename some variables to be consistent (#37804)

* Fix

* fix(review)
---
 scss/_utilities.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 10bd5c8bf..867c64e42 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -719,7 +719,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -734,7 +734,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -749,7 +749,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -764,7 +764,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -779,7 +779,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
-- 
cgit v1.2.3


From 9042efd0f86dd571386f62bacc8738ac975517fc Mon Sep 17 00:00:00 2001
From: Louis-Maxime Piton <louismaxime.piton@orange.com>
Date: Tue, 17 Jan 2023 00:55:28 +0100
Subject: Deprecate the Sass var and remove any occurence of the `.text-muted`
 (#37890)

---
 scss/_utilities.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 867c64e42..5ffb3feb8 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -583,7 +583,7 @@ $utilities: map-merge(
       values: map-merge(
         $utilities-text-colors,
         (
-          "muted": $text-muted, // deprecated
+          "muted": var(--#{$prefix}secondary-color), // deprecated
           "black-50": rgba($black, .5), // deprecated
           "white-50": rgba($white, .5), // deprecated
           "body-secondary": var(--#{$prefix}secondary-color),
-- 
cgit v1.2.3


From 3ce4fedaa2e180f64093b48e7f9de04c5754ad98 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 4 Feb 2023 14:30:59 +0700
Subject: Avoid inheritance issues on border-width utilities

---
 scss/_utilities.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 5ffb3feb8..9d4123d77 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -177,8 +177,9 @@ $utilities: map-merge(
       values: $utilities-border-subtle
     ),
     "border-width": (
-      css-var: true,
-      css-variable-name: border-width,
+      property: border-width,
+      // css-var: true,
+      // css-variable-name: border-width,
       class: border,
       values: $border-widths
     ),
-- 
cgit v1.2.3


From 0d27f3c284f1b2450e6aee5c61e7040a30c8e190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <julien.deramond@orange.com>
Date: Wed, 22 Feb 2023 12:09:15 +0100
Subject: Remove useless comment from `scss/_utilities.scss` (#38104)

---
 scss/_utilities.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 9d4123d77..e1191f146 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -634,7 +634,6 @@ $utilities: map-merge(
       )
     ),
     "link-underline": (
-      // css-var: true,
       property: text-decoration-color,
       class: link-underline,
       local-vars: (
-- 
cgit v1.2.3


From 23d20fa54f56df357501498719a5c63372bc49d0 Mon Sep 17 00:00:00 2001
From: Louis-Maxime Piton <louismaxime.piton@orange.com>
Date: Thu, 2 Mar 2023 07:45:25 +0100
Subject: Utilities: add 0 value to `link-underline-opacity` (#38131)

---
 scss/_utilities.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index e1191f146..6f1b306b3 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -651,6 +651,7 @@ $utilities: map-merge(
       class: link-underline-opacity,
       state: hover,
       values: (
+        0: 0,
         10: .1,
         25: .25,
         50: .5,
-- 
cgit v1.2.3


From 039f3d1c8bd1653d1fde5d14f5194e30e33c3c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <julien.deramond@orange.com>
Date: Tue, 7 Mar 2023 08:32:09 +0100
Subject: Remove comments from `scss/_utilities.scss` (#38181)

---
 scss/_utilities.scss | 2 --
 1 file changed, 2 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 6f1b306b3..37d248d7c 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -178,8 +178,6 @@ $utilities: map-merge(
     ),
     "border-width": (
       property: border-width,
-      // css-var: true,
-      // css-variable-name: border-width,
       class: border,
       values: $border-widths
     ),
-- 
cgit v1.2.3


From 33ad33843a4235804dd98553a7734942c1ba629f Mon Sep 17 00:00:00 2001
From: Serhii Babakov <babakov@aweb.ua>
Date: Mon, 20 Feb 2023 14:52:27 +0400
Subject: Update display utility

---
 scss/_utilities.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 37d248d7c..e6069c909 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -69,7 +69,7 @@ $utilities: map-merge(
       print: true,
       property: display,
       class: d,
-      values: inline inline-block block grid table table-row table-cell flex inline-flex none
+      values: inline inline-block block grid inline-grid table table-row table-cell flex inline-flex none
     ),
     // scss-docs-end utils-display
     // scss-docs-start utils-shadow
-- 
cgit v1.2.3


From c81a694ff3363c37b5ac8f8dbcb3f6ce90d350dd Mon Sep 17 00:00:00 2001
From: Craig Wayne <craigiswayne@gmail.com>
Date: Thu, 27 Jul 2023 21:46:12 +0100
Subject: Use CSS box-shadow variables in shadow utility classes (#38816)

---
 scss/_utilities.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scss/_utilities.scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index e6069c909..696f906ec 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -77,9 +77,9 @@ $utilities: map-merge(
       property: box-shadow,
       class: shadow,
       values: (
-        null: $box-shadow,
-        sm: $box-shadow-sm,
-        lg: $box-shadow-lg,
+        null: var(--#{$prefix}box-shadow),
+        sm: var(--#{$prefix}box-shadow-sm),
+        lg: var(--#{$prefix}box-shadow-lg),
         none: none,
       )
     ),
-- 
cgit v1.2.3