Skip to content

Commit bbaee32

Browse files
bedroesbbedroesb
authored
Merge pull request #213 from ELIXIR-Belgium/bootstrap-5.3.2
Update Bootstrap to 5.3.2 and fix warning in build
2 parents 8e0536d + 5497757 commit bbaee32

File tree

11 files changed

+31
-22
lines changed

11 files changed

+31
-22
lines changed

‎_sass/bootstrap/_buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
--#{$prefix}btn-disabled-color: #{$btn-link-disabled-color};
171171
--#{$prefix}btn-disabled-border-color: transparent;
172172
--#{$prefix}btn-box-shadow: 0 0 0 #000; // Can't use `none` as keyword negates all values when used with multiple shadows
173-
--#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($link-color), $link-color, 15%))};
173+
--#{$prefix}btn-focus-shadow-rgb: #{$btn-link-focus-shadow-rgb};
174174

175175
text-decoration: $link-decoration;
176176
@if $enable-gradients {

‎_sass/bootstrap/_reboot.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ small {
217217

218218
mark {
219219
padding: $mark-padding;
220+
color: var(--#{$prefix}highlight-color);
220221
background-color: var(--#{$prefix}highlight-bg);
221222
}
222223

‎_sass/bootstrap/_root.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
}
9292

9393
--#{$prefix}code-color: #{$code-color};
94+
--#{$prefix}highlight-color: #{$mark-color};
9495
--#{$prefix}highlight-bg: #{$mark-bg};
9596

9697
// scss-docs-start root-border-var
@@ -171,6 +172,8 @@
171172
--#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color-dark)};
172173

173174
--#{$prefix}code-color: #{$code-color-dark};
175+
--#{$prefix}highlight-color: #{$mark-color-dark};
176+
--#{$prefix}highlight-bg: #{$mark-bg-dark};
174177

175178
--#{$prefix}border-color: #{$border-color-dark};
176179
--#{$prefix}border-color-translucent: #{$border-color-translucent-dark};

‎_sass/bootstrap/_utilities.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ $utilities: map-merge(
7777
property: box-shadow,
7878
class: shadow,
7979
values: (
80-
null: $box-shadow,
81-
sm: $box-shadow-sm,
82-
lg: $box-shadow-lg,
80+
null: var(--#{$prefix}box-shadow),
81+
sm: var(--#{$prefix}box-shadow-sm),
82+
lg: var(--#{$prefix}box-shadow-lg),
8383
none: none,
8484
)
8585
),

‎_sass/bootstrap/_variables-dark.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ $headings-color-dark: inherit !default;
5353
$link-color-dark: tint-color($primary, 40%) !default;
5454
$link-hover-color-dark: shift-color($link-color-dark, -$link-shade-percentage) !default;
5555
$code-color-dark: tint-color($code-color, 40%) !default;
56+
$mark-color-dark: $body-color-dark !default;
57+
$mark-bg-dark: $yellow-800 !default;
5658

5759

5860
//

‎_sass/bootstrap/_variables.scss

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ $dt-font-weight: $font-weight-bold !default;
718718
$list-inline-padding: .5rem !default;
719719

720720
$mark-padding: .1875em !default;
721+
$mark-color: $body-color !default;
721722
$mark-bg: $yellow-100 !default;
722723
// scss-docs-end type-variables
723724

@@ -734,25 +735,25 @@ $table-cell-padding-x-sm: .25rem !default;
734735

735736
$table-cell-vertical-align: top !default;
736737

737-
$table-color: var(--#{$prefix}body-color) !default;
738+
$table-color: var(--#{$prefix}emphasis-color) !default;
738739
$table-bg: var(--#{$prefix}body-bg) !default;
739740
$table-accent-bg: transparent !default;
740741

741742
$table-th-font-weight: null !default;
742743

743744
$table-striped-color: $table-color !default;
744745
$table-striped-bg-factor: .05 !default;
745-
$table-striped-bg: rgba($black, $table-striped-bg-factor) !default;
746+
$table-striped-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-striped-bg-factor) !default;
746747

747748
$table-active-color: $table-color !default;
748749
$table-active-bg-factor: .1 !default;
749-
$table-active-bg: rgba($black, $table-active-bg-factor) !default;
750+
$table-active-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-active-bg-factor) !default;
750751

751752
$table-hover-color: $table-color !default;
752753
$table-hover-bg-factor: .075 !default;
753-
$table-hover-bg: rgba($black, $table-hover-bg-factor) !default;
754+
$table-hover-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-hover-bg-factor) !default;
754755

755-
$table-border-factor: .1 !default;
756+
$table-border-factor: .2 !default;
756757
$table-border-width: var(--#{$prefix}border-width) !default;
757758
$table-border-color: var(--#{$prefix}border-color) !default;
758759

@@ -842,6 +843,7 @@ $btn-active-box-shadow: inset 0 3px 5px rgba($black, .125) !default;
842843
$btn-link-color: var(--#{$prefix}link-color) !default;
843844
$btn-link-hover-color: var(--#{$prefix}link-hover-color) !default;
844845
$btn-link-disabled-color: $gray-600 !default;
846+
$btn-link-focus-shadow-rgb: to-rgb(mix(color-contrast($link-color), $link-color, 15%)) !default;
845847

846848
// Allows for customizing button radius independently from global border radius
847849
$btn-border-radius: var(--#{$prefix}border-radius) !default;
@@ -903,7 +905,7 @@ $input-disabled-border-color: null !default;
903905
$input-color: var(--#{$prefix}body-color) !default;
904906
$input-border-color: var(--#{$prefix}border-color) !default;
905907
$input-border-width: $input-btn-border-width !default;
906-
$input-box-shadow: $box-shadow-inset !default;
908+
$input-box-shadow: var(--#{$prefix}box-shadow-inset) !default;
907909

908910
$input-border-radius: var(--#{$prefix}border-radius) !default;
909911
$input-border-radius-sm: var(--#{$prefix}border-radius-sm) !default;
@@ -1019,7 +1021,7 @@ $form-select-feedback-icon-size: $input-height-inner-half $input-height-i
10191021
$form-select-border-width: $input-border-width !default;
10201022
$form-select-border-color: $input-border-color !default;
10211023
$form-select-border-radius: $input-border-radius !default;
1022-
$form-select-box-shadow: $box-shadow-inset !default;
1024+
$form-select-box-shadow: var(--#{$prefix}box-shadow-inset) !default;
10231025

10241026
$form-select-focus-border-color: $input-focus-border-color !default;
10251027
$form-select-focus-width: $input-focus-width !default;
@@ -1042,9 +1044,9 @@ $form-select-transition: $input-transition !default;
10421044
$form-range-track-width: 100% !default;
10431045
$form-range-track-height: .5rem !default;
10441046
$form-range-track-cursor: pointer !default;
1045-
$form-range-track-bg: var(--#{$prefix}tertiary-bg) !default;
1047+
$form-range-track-bg: var(--#{$prefix}secondary-bg) !default;
10461048
$form-range-track-border-radius: 1rem !default;
1047-
$form-range-track-box-shadow: $box-shadow-inset !default;
1049+
$form-range-track-box-shadow: var(--#{$prefix}box-shadow-inset) !default;
10481050

10491051
$form-range-thumb-width: 1rem !default;
10501052
$form-range-thumb-height: $form-range-thumb-width !default;
@@ -1246,7 +1248,7 @@ $dropdown-border-width: var(--#{$prefix}border-width) !default;
12461248
$dropdown-inner-border-radius: calc(#{$dropdown-border-radius} - #{$dropdown-border-width}) !default; // stylelint-disable-line function-disallowed-list
12471249
$dropdown-divider-bg: $dropdown-border-color !default;
12481250
$dropdown-divider-margin-y: $spacer * .5 !default;
1249-
$dropdown-box-shadow: $box-shadow !default;
1251+
$dropdown-box-shadow: var(--#{$prefix}box-shadow) !default;
12501252

12511253
$dropdown-link-color: var(--#{$prefix}body-color) !default;
12521254
$dropdown-link-hover-color: $dropdown-link-color !default;
@@ -1435,7 +1437,7 @@ $popover-border-width: var(--#{$prefix}border-width) !default;
14351437
$popover-border-color: var(--#{$prefix}border-color-translucent) !default;
14361438
$popover-border-radius: var(--#{$prefix}border-radius-lg) !default;
14371439
$popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; // stylelint-disable-line function-disallowed-list
1438-
$popover-box-shadow: $box-shadow !default;
1440+
$popover-box-shadow: var(--#{$prefix}box-shadow) !default;
14391441

14401442
$popover-header-font-size: $font-size-base !default;
14411443
$popover-header-bg: var(--#{$prefix}secondary-bg) !default;
@@ -1509,8 +1511,8 @@ $modal-content-border-color: var(--#{$prefix}border-color-translucent) !d
15091511
$modal-content-border-width: var(--#{$prefix}border-width) !default;
15101512
$modal-content-border-radius: var(--#{$prefix}border-radius-lg) !default;
15111513
$modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default;
1512-
$modal-content-box-shadow-xs: $box-shadow-sm !default;
1513-
$modal-content-box-shadow-sm-up: $box-shadow !default;
1514+
$modal-content-box-shadow-xs: var(--#{$prefix}box-shadow-sm) !default;
1515+
$modal-content-box-shadow-sm-up: var(--#{$prefix}box-shadow) !default;
15141516

15151517
$modal-backdrop-bg: $black !default;
15161518
$modal-backdrop-opacity: .5 !default;

‎_sass/bootstrap/forms/_form-check.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
.form-check-input {
3030
--#{$prefix}form-check-bg: #{$form-check-input-bg};
3131

32+
flex-shrink: 0;
3233
width: $form-check-input-width;
3334
height: $form-check-input-width;
3435
margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height

‎_sass/bootstrap/mixins/_banner.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@mixin bsBanner($file) {
22
/*!
3-
* Bootstrap #{$file} v5.3.1 (https://getbootstrap.com/)
3+
* Bootstrap #{$file} v5.3.2 (https://getbootstrap.com/)
44
* Copyright 2011-2023 The Bootstrap Authors
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
66
*/

‎_sass/bootstrap/mixins/_grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
@mixin row-cols($count) {
5757
> * {
5858
flex: 0 0 auto;
59-
width: divide(100%, $count);
59+
width: percentage(divide(1, $count));
6060
}
6161
}
6262

‎assets/js/bootstrap.bundle.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/bootstrap.bundle.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)