Remove add, subtract functions

diff --git a/scss/_functions.scss b/scss/_functions.scss
index 90296586b3c8cb64e3105ed61ca44773f815ef6a..147c0845e295e1784f21afee498e7733a3e6cea5 100644 (file)
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -219,45 +219,45 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
 // scss-docs-end color-functions
 
 // Return valid calc
-@function add($value1, $value2, $return-calc: true) {
-  @if $value1 == null {
-    @return $value2;
-  }
+// @function add($value1, $value2, $return-calc: true) {
+//   @if $value1 == null {
+//     @return $value2;
+//   }
 
-  @if $value2 == null {
-    @return $value1;
-  }
+//   @if $value2 == null {
+//     @return $value1;
+//   }
 
-  @if type-of($value1) == number and type-of($value2) == number and comparable($value1, $value2) {
-    @return $value1 + $value2;
-  }
+//   @if type-of($value1) == number and type-of($value2) == number and comparable($value1, $value2) {
+//     @return $value1 + $value2;
+//   }
 
-  @return if($return-calc == true, calc(#{$value1} + #{$value2}), $value1 + unquote(" + ") + $value2);
-}
+//   @return if($return-calc == true, calc(#{$value1} + #{$value2}), $value1 + unquote(" + ") + $value2);
+// }
 
-@function subtract($value1, $value2, $return-calc: true) {
-  @if $value1 == null and $value2 == null {
-    @return null;
-  }
+// @function subtract($value1, $value2, $return-calc: true) {
+//   @if $value1 == null and $value2 == null {
+//     @return null;
+//   }
 
-  @if $value1 == null {
-    @return -$value2;
-  }
+//   @if $value1 == null {
+//     @return -$value2;
+//   }
 
-  @if $value2 == null {
-    @return $value1;
-  }
+//   @if $value2 == null {
+//     @return $value1;
+//   }
 
-  @if type-of($value1) == number and type-of($value2) == number and comparable($value1, $value2) {
-    @return $value1 - $value2;
-  }
+//   @if type-of($value1) == number and type-of($value2) == number and comparable($value1, $value2) {
+//     @return $value1 - $value2;
+//   }
 
-  @if type-of($value2) != number {
-    $value2: unquote("(") + $value2 + unquote(")");
-  }
+//   @if type-of($value2) != number {
+//     $value2: unquote("(") + $value2 + unquote(")");
+//   }
 
-  @return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote(" - ") + $value2);
-}
+//   @return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote(" - ") + $value2);
+// }
 
 @function divide($dividend, $divisor, $precision: 10) {
   $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);

diff --git a/scss/_variables.scss b/scss/_variables.scss
index cfe25b528fa82da89e0125291390821799201614..e77b283ff1992223fa7e89c78e61724fc39c172b 100644 (file)
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -922,13 +922,13 @@ $input-plaintext-color:                 var(--#{$prefix}body-color) !default;
 
 $input-height-border:                   calc(#{$input-border-width} * 2) !default; // stylelint-disable-line function-disallowed-list
 
-$input-height-inner:                    add($input-line-height * 1em, $input-padding-y * 2) !default;
-$input-height-inner-half:               add($input-line-height * .5em, $input-padding-y) !default;
-$input-height-inner-quarter:            add($input-line-height * .25em, $input-padding-y * .5) !default;
+$input-height-inner:                    calc(#{$input-line-height} * 1em + #{$input-padding-y} * 2) !default;
+$input-height-inner-half:               calc(#{$input-line-height} * .5em + #{$input-padding-y}) !default;
+$input-height-inner-quarter:            calc(#{$input-line-height} * .25em + #{$input-padding-y} * .5) !default;
 
-$input-height:                          add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default;
-$input-height-sm:                       add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
-$input-height-lg:                       add($input-line-height * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default;
+$input-height:                          calc(#{$input-line-height} * 1em + #{$input-padding-y} * 2 + #{$input-height-border}) !default;
+$input-height-sm:                       calc(#{$input-line-height} * 1em + #{$input-padding-y-sm} * 2 + #{$input-height-border}) !default;
+$input-height-lg:                       calc(#{$input-line-height} * 1em + #{$input-padding-y-lg} * 2 + #{$input-height-border}) !default;
 
 $input-transition:                      border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
 
@@ -1068,7 +1068,7 @@ $form-file-button-hover-bg:       var(--#{$prefix}secondary-bg) !default;
 // scss-docs-end form-file-variables
 
 // scss-docs-start form-floating-variables
-$form-floating-height:                  add(3.5rem, $input-height-border) !default;
+$form-floating-height:                  calc(3.5rem + #{$input-height-border}) !default;
 $form-floating-line-height:             1.25 !default;
 $form-floating-padding-x:               $input-padding-x !default;
 $form-floating-padding-y:               1rem !default;
@@ -1348,7 +1348,7 @@ $card-border-width:                 var(--#{$prefix}border-width) !default;
 $card-border-color:                 var(--#{$prefix}border-color-translucent) !default;
 $card-border-radius:                var(--#{$prefix}border-radius) !default;
 $card-box-shadow:                   null !default;
-$card-inner-border-radius:          subtract($card-border-radius, $card-border-width) !default;
+$card-inner-border-radius:          calc(#{$card-border-radius} - #{$card-border-width}) !default;
 $card-cap-padding-y:                $card-spacer-y * .5 !default;
 $card-cap-padding-x:                $card-spacer-x !default;
 $card-cap-bg:                       rgba(var(--#{$prefix}body-color-rgb), .03) !default;
@@ -1370,7 +1370,7 @@ $accordion-bg:                            var(--#{$prefix}body-bg) !default;
 $accordion-border-width:                  var(--#{$prefix}border-width) !default;
 $accordion-border-color:                  var(--#{$prefix}border-color) !default;
 $accordion-border-radius:                 var(--#{$prefix}border-radius) !default;
-$accordion-inner-border-radius:           subtract($accordion-border-radius, $accordion-border-width) !default;
+$accordion-inner-border-radius:           calc(#{$accordion-border-radius} - #{$accordion-border-width}) !default;
 
 $accordion-body-padding-y:                $accordion-padding-y !default;
 $accordion-body-padding-x:                $accordion-padding-x !default;
@@ -1512,7 +1512,7 @@ $modal-content-bg:                  var(--#{$prefix}body-bg) !default;
 $modal-content-border-color:        var(--#{$prefix}border-color-translucent) !default;
 $modal-content-border-width:        var(--#{$prefix}border-width) !default;
 $modal-content-border-radius:       var(--#{$prefix}border-radius-lg) !default;
-$modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default;
+$modal-content-inner-border-radius: calc(#{$modal-content-border-radius} - #{$modal-content-border-width}) !default;
 $modal-content-box-shadow-xs:       var(--#{$prefix}box-shadow-sm) !default;
 $modal-content-box-shadow-sm-up:    var(--#{$prefix}box-shadow) !default;
 

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
deleted file mode 100644 (file)
index 52bd577..0000000
--- a/scss/bootstrap-grid.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-@import "mixins/banner";
-@include bsBanner(Grid);
-
-$include-column-box-sizing: true !default;
-
-@import "functions";
-@import "variables";
-@import "variables-dark";
-@import "maps";
-
-@import "mixins/breakpoints";
-@import "mixins/container";
-@import "mixins/grid";
-@import "mixins/utilities";
-
-@import "vendor/rfs";
-
-@import "containers";
-@import "grid";
-
-@import "utilities";
-// Only use the utilities we need
-// stylelint-disable-next-line scss/dollar-variable-default
-$utilities: map-get-multiple(
-  $utilities,
-  (
-    "display",
-    "order",
-    "flex",
-    "flex-direction",
-    "flex-grow",
-    "flex-shrink",
-    "flex-wrap",
-    "justify-content",
-    "align-items",
-    "align-content",
-    "align-self",
-    "margin",
-    "margin-x",
-    "margin-y",
-    "margin-top",
-    "margin-end",
-    "margin-bottom",
-    "margin-start",
-    "negative-margin",
-    "negative-margin-x",
-    "negative-margin-y",
-    "negative-margin-top",
-    "negative-margin-end",
-    "negative-margin-bottom",
-    "negative-margin-start",
-    "padding",
-    "padding-x",
-    "padding-y",
-    "padding-top",
-    "padding-end",
-    "padding-bottom",
-    "padding-start",
-  )
-);
-
-@import "utilities/api";

diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
deleted file mode 100644 (file)
index 5b69b95..0000000
--- a/scss/bootstrap-reboot.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "mixins/banner";
-@include bsBanner(Reboot);
-
-@import "functions";
-@import "variables";
-@import "variables-dark";
-@import "maps";
-@import "mixins";
-@import "root";
-@import "reboot";

diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss
deleted file mode 100644 (file)
index 99c4a35..0000000
--- a/scss/bootstrap-utilities.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-@import "mixins/banner";
-@include bsBanner(Utilities);
-
-// Configuration
-@import "functions";
-@import "variables";
-@import "variables-dark";
-@import "maps";
-@import "mixins";
-@import "utilities";
-
-// Layout & components
-@import "root";
-
-// Helpers
-@import "helpers";
-
-// Utilities
-@import "utilities/api";

diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 449d704878fa210c85e09a2af91723eee9f14ad6..a065ba4e8dc3289a065467bcc90151e515382363 100644 (file)
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,6 +1,8 @@
-@import "mixins/banner";
-@include bsBanner("");
-
+/*!
+  * Bootstrap v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
 
 // scss-docs-start import-stack
 // Configuration

diff --git a/scss/forms/_form-range.scss b/scss/forms/_form-range.scss
index 4732213e977ef752d8fe1339d73c6bef7ceee7a8..8ee3727203af79232f502e14700d80c24caa9ef5 100644 (file)
--- a/scss/forms/_form-range.scss
+++ b/scss/forms/_form-range.scss
@@ -6,7 +6,7 @@
 
 .form-range {
   width: 100%;
-  height: add($form-range-thumb-height, $form-range-thumb-focus-box-shadow-width * 2);
+  height: calc(#{$form-range-thumb-height} + #{$form-range-thumb-focus-box-shadow-width} * 2);
   padding: 0; // Need to reset padding
   appearance: none;
   background-color: transparent;

diff --git a/scss/forms/_labels.scss b/scss/forms/_labels.scss
index 39ecafcd2f0d5be8843b4be9ff5d7ac0d608c350..93a97d57ed0b92929f0e61aac680866600c935e7 100644 (file)
--- a/scss/forms/_labels.scss
+++ b/scss/forms/_labels.scss
@@ -13,8 +13,8 @@
 // For use with horizontal and inline forms, when you need the label (or legend)
 // text to align with the form controls.
 .col-form-label {
-  padding-top: add($input-padding-y, $input-border-width);
-  padding-bottom: add($input-padding-y, $input-border-width);
+  padding-top: calc(#{$input-padding-y} + #{$input-border-width});
+  padding-bottom: calc(#{$input-padding-y} + #{$input-border-width});
   margin-bottom: 0; // Override the `<legend>` default
   @include font-size(inherit); // Override the `<legend>` default
   font-style: $form-label-font-style;
@@ -24,13 +24,13 @@
 }
 
 .col-form-label-lg {
-  padding-top: add($input-padding-y-lg, $input-border-width);
-  padding-bottom: add($input-padding-y-lg, $input-border-width);
+  padding-top: calc(#{$input-padding-y-lg} + #{$input-border-width});
+  padding-bottom: calc(#{$input-padding-y-lg} + #{$input-border-width});
   @include font-size($input-font-size-lg);
 }
 
 .col-form-label-sm {
-  padding-top: add($input-padding-y-sm, $input-border-width);
-  padding-bottom: add($input-padding-y-sm, $input-border-width);
+  padding-top: calc(#{$input-padding-y-sm} + #{$input-border-width});
+  padding-bottom: calc(#{$input-padding-y-sm} + #{$input-border-width});
   @include font-size($input-font-size-sm);
 }

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 00b47641346375ed5bd8c26551358568605b71f9..6d725e9a569edb598216a4f802c76067da2d695d 100644 (file)
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -118,7 +118,7 @@
   .form-control-color {
     @include form-validation-state-selector($state) {
       @if $enable-validation-icons {
-        width: add($form-color-width, $input-height-inner);
+        width: calc(#{$form-color-width} + #{$input-height-inner});
       }
     }
   }

diff --git a/site/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss
index 598da3d5b23866343017030f896fbc2b9a20d3e6..fe445565343e98ca56e512a9f781f8316ae61bcc 100644 (file)
--- a/site/assets/scss/_sidebar.scss
+++ b/site/assets/scss/_sidebar.scss
@@ -5,7 +5,7 @@
     // Override collapse behaviors
     // stylelint-disable-next-line declaration-no-important
     display: block !important;
-    height: subtract(100vh, 6rem);
+    height: calc(100vh - 6rem);
     // Prevent focus styles to be cut off:
     padding-left: .25rem;
     margin-left: -.25rem;

diff --git a/site/assets/scss/_toc.scss b/site/assets/scss/_toc.scss
index 32bf3cf625c562e7229132e11534ba6fa3a3c6f8..6dfaf1da60a9325410b0d79cb357559ed6d516f0 100644 (file)
--- a/site/assets/scss/_toc.scss
+++ b/site/assets/scss/_toc.scss
@@ -6,7 +6,7 @@
     top: 5rem;
     right: 0;
     z-index: 2;
-    height: subtract(100vh, 7rem);
+    height: calc(100vh - 7rem);
     overflow-y: auto;
   }