Skip to content

Commit c27da39

Browse files
committed
1 parent 9de1771 commit c27da39

19 files changed

+39
-28
lines changed

_sass/bootstrap/_alert.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
position: absolute;
3535
top: 0;
3636
right: 0;
37+
z-index: 2;
3738
padding: $alert-padding-y $alert-padding-x;
3839
color: inherit;
3940
}

_sass/bootstrap/_card.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,12 @@
206206

207207
.card-img-top,
208208
.card-header {
209-
// stylelint-disable-next-line property-blacklist
209+
// stylelint-disable-next-line property-disallowed-list
210210
border-top-right-radius: 0;
211211
}
212212
.card-img-bottom,
213213
.card-footer {
214-
// stylelint-disable-next-line property-blacklist
214+
// stylelint-disable-next-line property-disallowed-list
215215
border-bottom-right-radius: 0;
216216
}
217217
}
@@ -221,12 +221,12 @@
221221

222222
.card-img-top,
223223
.card-header {
224-
// stylelint-disable-next-line property-blacklist
224+
// stylelint-disable-next-line property-disallowed-list
225225
border-top-left-radius: 0;
226226
}
227227
.card-img-bottom,
228228
.card-footer {
229-
// stylelint-disable-next-line property-blacklist
229+
// stylelint-disable-next-line property-disallowed-list
230230
border-bottom-left-radius: 0;
231231
}
232232
}

_sass/bootstrap/_custom-forms.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
display: block;
1414
min-height: $font-size-base * $line-height-base;
1515
padding-left: $custom-control-gutter + $custom-control-indicator-size;
16+
color-adjust: exact; // Keep themed appearance for print
1617
}
1718

1819
.custom-control-inline {
@@ -38,7 +39,7 @@
3839
&:focus ~ .custom-control-label::before {
3940
// the mixin is not used here to make sure there is feedback
4041
@if $enable-shadows {
41-
box-shadow: $input-box-shadow, $input-focus-box-shadow;
42+
box-shadow: $input-box-shadow, $custom-control-indicator-focus-box-shadow;
4243
} @else {
4344
box-shadow: $custom-control-indicator-focus-box-shadow;
4445
}
@@ -150,7 +151,7 @@
150151

151152
.custom-radio {
152153
.custom-control-label::before {
153-
// stylelint-disable-next-line property-blacklist
154+
// stylelint-disable-next-line property-disallowed-list
154155
border-radius: $custom-radio-indicator-border-radius;
155156
}
156157

@@ -180,7 +181,7 @@
180181
left: -($custom-switch-width + $custom-control-gutter);
181182
width: $custom-switch-width;
182183
pointer-events: all;
183-
// stylelint-disable-next-line property-blacklist
184+
// stylelint-disable-next-line property-disallowed-list
184185
border-radius: $custom-switch-indicator-border-radius;
185186
}
186187

@@ -190,7 +191,7 @@
190191
width: $custom-switch-indicator-size;
191192
height: $custom-switch-indicator-size;
192193
background-color: $custom-control-indicator-border-color;
193-
// stylelint-disable-next-line property-blacklist
194+
// stylelint-disable-next-line property-disallowed-list
194195
border-radius: $custom-switch-indicator-border-radius;
195196
@include transition(transform .15s ease-in-out, $custom-forms-transition);
196197
}

_sass/bootstrap/_dropdown.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
display: none; // none by default, but block on "open" of the menu
2323
float: left;
2424
min-width: $dropdown-min-width;
25-
padding: $dropdown-padding-y 0;
25+
padding: $dropdown-padding-y $dropdown-padding-x;
2626
margin: $dropdown-spacer 0 0; // override default ul
2727
@include font-size($dropdown-font-size);
2828
color: $dropdown-color;

_sass/bootstrap/_functions.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
}
5252

5353
// See https://codepen.io/kevinweber/pen/dXWoRw
54+
//
55+
// Requires the use of quotes around data URIs.
56+
5457
@function escape-svg($string) {
5558
@if str-index($string, "data:image/svg+xml") {
5659
@each $char, $encoded in $escaped-characters {

_sass/bootstrap/_list-group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
margin-top: 0;
112112
}
113113

114-
& + .list-group-item {
114+
+ .list-group-item {
115115
border-top-width: $list-group-border-width;
116116
border-left-width: 0;
117117

_sass/bootstrap/_reboot.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,14 @@ caption {
278278
caption-side: bottom;
279279
}
280280

281+
// 1. Removes font-weight bold by inheriting
282+
// 2. Matches default `<td>` alignment by inheriting `text-align`.
283+
// 3. Fix alignment for Safari
284+
281285
th {
282-
// Matches default `<td>` alignment by inheriting from the `<body>`, or the
283-
// closest parent with a set `text-align`.
284-
text-align: inherit;
286+
font-weight: $table-th-font-weight; // 1
287+
text-align: inherit; // 2
288+
text-align: -webkit-match-parent; // 3
285289
}
286290

287291

@@ -299,7 +303,7 @@ label {
299303
//
300304
// Details at https://github.com/twbs/bootstrap/issues/24093
301305
button {
302-
// stylelint-disable-next-line property-blacklist
306+
// stylelint-disable-next-line property-disallowed-list
303307
border-radius: 0;
304308
}
305309

_sass/bootstrap/_spinners.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
vertical-align: text-bottom;
1414
border: $spinner-border-width solid currentColor;
1515
border-right-color: transparent;
16-
// stylelint-disable-next-line property-blacklist
16+
// stylelint-disable-next-line property-disallowed-list
1717
border-radius: 50%;
1818
animation: spinner-border .75s linear infinite;
1919
}
@@ -44,7 +44,7 @@
4444
height: $spinner-height;
4545
vertical-align: text-bottom;
4646
background-color: currentColor;
47-
// stylelint-disable-next-line property-blacklist
47+
// stylelint-disable-next-line property-disallowed-list
4848
border-radius: 50%;
4949
opacity: 0;
5050
animation: spinner-grow .75s linear infinite;

_sass/bootstrap/_variables.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ $table-border-color: $border-color !default;
363363

364364
$table-head-bg: $gray-200 !default;
365365
$table-head-color: $gray-700 !default;
366+
$table-th-font-weight: null !default;
366367

367368
$table-dark-color: $white !default;
368369
$table-dark-bg: $gray-800 !default;
@@ -755,6 +756,7 @@ $navbar-dark-brand-hover-color: $navbar-dark-active-color !default;
755756
// Dropdown menu container and contents.
756757

757758
$dropdown-min-width: 10rem !default;
759+
$dropdown-padding-x: 0 !default;
758760
$dropdown-padding-y: .5rem !default;
759761
$dropdown-spacer: .125rem !default;
760762
$dropdown-font-size: $font-size-base !default;

_sass/bootstrap/bootstrap-grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap Grid v4.5.2 (https://getbootstrap.com/)
2+
* Bootstrap Grid v4.5.3 (https://getbootstrap.com/)
33
* Copyright 2011-2020 The Bootstrap Authors
44
* Copyright 2011-2020 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

_sass/bootstrap/bootstrap-reboot.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap Reboot v4.5.2 (https://getbootstrap.com/)
2+
* Bootstrap Reboot v4.5.3 (https://getbootstrap.com/)
33
* Copyright 2011-2020 The Bootstrap Authors
44
* Copyright 2011-2020 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

_sass/bootstrap/bootstrap.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v4.5.2 (https://getbootstrap.com/)
2+
* Bootstrap v4.5.3 (https://getbootstrap.com/)
33
* Copyright 2011-2020 The Bootstrap Authors
44
* Copyright 2011-2020 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

_sass/bootstrap/mixins/_border-radius.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// stylelint-disable property-blacklist
1+
// stylelint-disable property-disallowed-list
22
// Single side border-radius
33

44
// Helper function to replace negative values with 0

_sass/bootstrap/mixins/_grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
// numberof columns. Supports wrapping to new lines, but does not do a Masonry
6363
// style grid.
6464
@mixin row-cols($count) {
65-
& > * {
65+
> * {
6666
flex: 0 0 100% / $count;
6767
max-width: 100% / $count;
6868
}

_sass/bootstrap/mixins/_screen-reader.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Only display content to screen readers
22
//
3-
// See: https://a11yproject.com/posts/how-to-hide-content/
3+
// See: https://www.a11yproject.com/posts/2013-01-11-how-to-hide-content/
44
// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/
55

66
@mixin sr-only() {

_sass/bootstrap/mixins/_transition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// stylelint-disable property-blacklist
1+
// stylelint-disable property-disallowed-list
22
@mixin transition($transition...) {
33
@if length($transition) == 0 {
44
$transition: $transition-base;

_sass/bootstrap/utilities/_borders.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// stylelint-disable property-blacklist, declaration-no-important
1+
// stylelint-disable property-disallowed-list, declaration-no-important
22

33
//
44
// Border

_sass/bootstrap/utilities/_text.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
.text-decoration-none { text-decoration: none !important; }
6464

6565
.text-break {
66-
word-break: break-word !important; // IE & < Edge 18
67-
overflow-wrap: break-word !important;
66+
word-break: break-word !important; // Deprecated, but avoids issues with flex containers
67+
word-wrap: break-word !important; // Used instead of `overflow-wrap` for IE & Edge Legacy
6868
}
6969

7070
// Reset

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.

0 commit comments

Comments
 (0)