Skip to content

Commit 1bd53a8

Browse files
committed
Bootstrap 5.1.1
1 parent 0503d2f commit 1bd53a8

4 files changed

Lines changed: 25 additions & 16 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"main": "index.js",
99
"devDependencies": {
1010
"autoprefixer": "^10.3.4",
11-
"bootstrap": "^5.1.0",
11+
"bootstrap": "^5.1.1",
1212
"browser-sync": "^2.27.5",
1313
"del": "^6.0.0",
1414
"esm": "^3.2.25",

src/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"bootstrapVersion": "5.1.0",
2+
"bootstrapVersion": "5.1.1",
33
"sampleColors": [
44
{
55
"name": "red",

src/scss/_4-customized-bootstrap-variables.scss

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -454,20 +454,29 @@
454454
//
455455
// Extends the default `$theme-colors` maps to help create our utilities.
456456

457-
// uncomment whole block
458-
// so you can define only new ones you need
457+
// Come v6, we'll de-dupe these variables. Until then, for backward compatibility, we keep them to reassign.
458+
459+
// uncomment the whole block
459460
/*
460-
$utilities-colors: map-merge(
461-
$theme-colors-rgb,
462-
(
463-
"black": to-rgb($black),
464-
"white": to-rgb($white),
465-
"body": to-rgb($body-color)
466-
)
467-
); $utilities-colors: $utilities-colors !global;
461+
$utilities-colors: $theme-colors-rgb; $utilities-colors: $utilities-colors !global; // do not change!
462+
$utilities-text: map-merge(
463+
$utilities-colors,
464+
(
465+
"black": to-rgb($black),
466+
"white": to-rgb($white),
467+
"body": to-rgb($body-color)
468+
)
469+
); $utilities-text: $utilities-text !global;
470+
471+
$utilities-bg: map-merge(
472+
$utilities-colors,
473+
(
474+
"black": to-rgb($black),
475+
"white": to-rgb($white),
476+
"body": to-rgb($body-bg)
477+
)
478+
); $utilities-bg: $utilities-bg !global;
468479
*/
469-
// $utilities-text-colors: map-loop($utilities-colors, rgba-css-var, "$key", "text"); $utilities-text-colors: $utilities-text-colors !global; // map-loop($utilities-colors, rgba-css-var, "$key", "text")
470-
// $utilities-bg-colors: map-loop($utilities-colors, rgba-css-var, "$key", "bg"); $utilities-bg-colors: $utilities-bg-colors !global; // map-loop($utilities-colors, rgba-css-var, "$key", "bg")
471480

472481

473482
// Links
@@ -1142,7 +1151,7 @@
11421151
// $dropdown-box-shadow: $box-shadow; $dropdown-box-shadow: $dropdown-box-shadow !global; // $box-shadow
11431152

11441153
// $dropdown-link-color: $gray-900; $dropdown-link-color: $dropdown-link-color !global; // $gray-900
1145-
// $dropdown-link-hover-color: shade-color($gray-900, 10%); $dropdown-link-hover-color: $dropdown-link-hover-color !global; // shade-color($gray-900, 10%)
1154+
// $dropdown-link-hover-color: shade-color($dropdown-link-color, 10%); $dropdown-link-hover-color: $dropdown-link-hover-color !global; // shade-color($dropdown-link-color, 10%)
11461155
// $dropdown-link-hover-bg: $gray-200; $dropdown-link-hover-bg: $dropdown-link-hover-bg !global; // $gray-200
11471156

11481157
// $dropdown-link-active-color: $component-active-color; $dropdown-link-active-color: $dropdown-link-active-color !global; // $component-active-color

src/templates/_base.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Optional JavaScript -->
1313
<!-- jQuery first if needed then Bootstrap JS and your own script at the end -->
1414
<script src="https://code.jquery.com/jquery-3.6.0.slim.min.js" integrity="sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=" crossorigin="anonymous"></script>
15-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha256-KuvCVS19rfTjoLgMyDDCdOkRRlhNrY4psEM4uezts2M=" crossorigin="anonymous"></script>
15+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-/bQdsTh/da6pkI1MST/rWKFNjaCP5gBSY4sEBT38Q/9RBh9AH40zEOg7Hlq2THRZ" crossorigin="anonymous"></script>
1616
<script src="js/custom.js"></script>
1717
#}
1818
</body>

0 commit comments

Comments
 (0)