Skip to content

Commit 3c4cd44

Browse files
committed
bumped bootstrap to 5.0.2
+ bumped postcss and sass
1 parent d1415a9 commit 3c4cd44

6 files changed

Lines changed: 60 additions & 57 deletions

File tree

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"main": "index.js",
99
"devDependencies": {
1010
"autoprefixer": "^10.2.6",
11-
"bootstrap": "^5.0.1",
11+
"bootstrap": "^5.0.2",
1212
"browser-sync": "^2.26.14",
1313
"del": "^6.0.0",
1414
"esm": "^3.2.25",
@@ -18,10 +18,10 @@
1818
"gulp-nunjucks": "^5.1.0",
1919
"gulp-postcss": "^9.0.0",
2020
"gulp-sourcemaps": "^3.0.0",
21-
"postcss": "^8.3.0",
21+
"postcss": "^8.3.5",
2222
"postcss-uncss": "^0.17.0",
2323
"prettier": "2.3.1",
24-
"sass": "^1.34.1",
24+
"sass": "^1.35.1",
2525
"surge": "^0.23.0",
2626
"uncss": "^0.17.3"
2727
},

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.0.1",
2+
"bootstrapVersion": "5.0.2",
33
"sampleColors": [
44
{
55
"name": "red",

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@
285285
/*
286286
$spacers: (
287287
0: 0,
288-
1: $spacer / 4,
289-
2: $spacer / 2,
288+
1: $spacer * .25,
289+
2: $spacer * .5,
290290
3: $spacer,
291291
4: $spacer * 1.5,
292292
5: $spacer * 3,
@@ -381,7 +381,7 @@
381381

382382
// Container padding
383383

384-
// $container-padding-x: $grid-gutter-width / 2; $container-padding-x: $container-padding-x !global; // $grid-gutter-width / 2
384+
// $container-padding-x: $grid-gutter-width * .5; $container-padding-x: $container-padding-x !global; // $grid-gutter-width * .5
385385

386386

387387
// Components
@@ -445,8 +445,8 @@
445445
// stylelint-enable value-keyword-case
446446
// $font-family-base: var(--#{$variable-prefix}font-sans-serif); $font-family-base: $font-family-base !global; // var(--#{$variable-prefix}font-sans-serif)
447447
// $font-family-code: var(--#{$variable-prefix}font-monospace); $font-family-code: $font-family-code !global; // var(--#{$variable-prefix}font-monospace)
448-
// $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins
449-
// $font-size-base effects the font size of the body text
448+
// $font-size-root affects the value of `rem`, which is used for as well font sizes, paddings and margins
449+
// $font-size-base affects the font size of the body text
450450
// $font-size-root: null; $font-size-root: $font-size-root !global; // null
451451
// $font-size-base: 1rem; $font-size-base: $font-size-base !global; // 1rem // Assumes the browser default, typically `16px`
452452
// $font-size-sm: $font-size-base * .875; $font-size-sm: $font-size-sm !global; // $font-size-base * .875
@@ -482,7 +482,7 @@
482482
); $font-sizes: $font-sizes !global;
483483
*/
484484

485-
// $headings-margin-bottom: $spacer / 2; $headings-margin-bottom: $headings-margin-bottom !global; // $spacer / 2
485+
// $headings-margin-bottom: $spacer * .5; $headings-margin-bottom: $headings-margin-bottom !global; // $spacer * .5
486486
// $headings-font-family: null; $headings-font-family: $headings-font-family !global; // null
487487
// $headings-font-style: null; $headings-font-style: $headings-font-style !global; // null
488488
// $headings-font-weight: 500; $headings-font-weight: $headings-font-weight !global; // 500
@@ -723,7 +723,7 @@
723723

724724
// $input-height-inner: add($input-line-height * 1em, $input-padding-y * 2); $input-height-inner: $input-height-inner !global; // add($input-line-height * 1em, $input-padding-y * 2)
725725
// $input-height-inner-half: add($input-line-height * .5em, $input-padding-y); $input-height-inner-half: $input-height-inner-half !global; // add($input-line-height * .5em, $input-padding-y)
726-
// $input-height-inner-quarter: add($input-line-height * .25em, $input-padding-y / 2); $input-height-inner-quarter: $input-height-inner-quarter !global; // add($input-line-height * .25em, $input-padding-y / 2)
726+
// $input-height-inner-quarter: add($input-line-height * .25em, $input-padding-y * .5); $input-height-inner-quarter: $input-height-inner-quarter !global; // add($input-line-height * .25em, $input-padding-y * .5)
727727

728728
// $input-height: add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)); $input-height: $input-height !global; // add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false))
729729
// $input-height-sm: add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)); $input-height-sm: $input-height-sm !global; // add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false))
@@ -824,6 +824,7 @@
824824
// $form-select-padding-x-lg: $input-padding-x-lg; $form-select-padding-x-lg: $form-select-padding-x-lg !global; // $input-padding-x-lg
825825
// $form-select-font-size-lg: $input-font-size-lg; $form-select-font-size-lg: $form-select-font-size-lg !global; // $input-font-size-lg
826826

827+
// $form-select-transition: $input-transition; $form-select-transition: $form-select-transition !global; // $input-transition
827828
// $form-range-track-width: 100%; $form-range-track-width: $form-range-track-width !global; // 100%
828829
// $form-range-track-height: .5rem; $form-range-track-height: $form-range-track-height !global; // .5rem
829830
// $form-range-track-cursor: pointer; $form-range-track-cursor: $form-range-track-cursor !global; // pointer
@@ -848,6 +849,8 @@
848849
// $form-file-button-hover-bg: shade-color($form-file-button-bg, 5%); $form-file-button-hover-bg: $form-file-button-hover-bg !global; // shade-color($form-file-button-bg, 5%)
849850

850851
// $form-floating-height: add(3.5rem, $input-height-border); $form-floating-height: $form-floating-height !global; // add(3.5rem, $input-height-border)
852+
853+
// $form-floating-line-height: 1.25; $form-floating-line-height: $form-floating-line-height !global; // 1.25
851854
// $form-floating-padding-x: $input-padding-x; $form-floating-padding-x: $form-floating-padding-x !global; // $input-padding-x
852855
// $form-floating-padding-y: 1rem; $form-floating-padding-y: $form-floating-padding-y !global; // 1rem
853856
// $form-floating-input-padding-t: 1.625rem; $form-floating-input-padding-t: $form-floating-input-padding-t !global; // 1.625rem
@@ -923,7 +926,7 @@
923926

924927
// Navbar
925928

926-
// $navbar-padding-y: $spacer / 2; $navbar-padding-y: $navbar-padding-y !global; // $spacer / 2
929+
// $navbar-padding-y: $spacer * .5; $navbar-padding-y: $navbar-padding-y !global; // $spacer * .5
927930
// $navbar-padding-x: null; $navbar-padding-x: $navbar-padding-x !global; // null
928931

929932
// $navbar-nav-link-padding-x: .5rem; $navbar-nav-link-padding-x: $navbar-nav-link-padding-x !global; // .5rem
@@ -932,7 +935,7 @@
932935
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
933936
// $nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2; $nav-link-height: $nav-link-height !global; // $font-size-base * $line-height-base + $nav-link-padding-y * 2
934937
// $navbar-brand-height: $navbar-brand-font-size * $line-height-base; $navbar-brand-height: $navbar-brand-height !global; // $navbar-brand-font-size * $line-height-base
935-
// $navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2; $navbar-brand-padding-y: $navbar-brand-padding-y !global; // ($nav-link-height - $navbar-brand-height) / 2
938+
// $navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) * .5; $navbar-brand-padding-y: $navbar-brand-padding-y !global; // ($nav-link-height - $navbar-brand-height) * .5
936939
// $navbar-brand-margin-end: 1rem; $navbar-brand-margin-end: $navbar-brand-margin-end !global; // 1rem
937940

938941
// $navbar-toggler-padding-y: .25rem; $navbar-toggler-padding-y: $navbar-toggler-padding-y !global; // .25rem
@@ -978,7 +981,7 @@
978981
// $dropdown-border-width: $border-width; $dropdown-border-width: $dropdown-border-width !global; // $border-width
979982
// $dropdown-inner-border-radius: subtract($dropdown-border-radius, $dropdown-border-width); $dropdown-inner-border-radius: $dropdown-inner-border-radius !global; // subtract($dropdown-border-radius, $dropdown-border-width)
980983
// $dropdown-divider-bg: $dropdown-border-color; $dropdown-divider-bg: $dropdown-divider-bg !global; // $dropdown-border-color
981-
// $dropdown-divider-margin-y: $spacer / 2; $dropdown-divider-margin-y: $dropdown-divider-margin-y !global; // $spacer / 2
984+
// $dropdown-divider-margin-y: $spacer * .5; $dropdown-divider-margin-y: $dropdown-divider-margin-y !global; // $spacer * .5
982985
// $dropdown-box-shadow: $box-shadow; $dropdown-box-shadow: $dropdown-box-shadow !global; // $box-shadow
983986

984987
// $dropdown-link-color: $gray-900; $dropdown-link-color: $dropdown-link-color !global; // $gray-900
@@ -990,7 +993,7 @@
990993

991994
// $dropdown-link-disabled-color: $gray-500; $dropdown-link-disabled-color: $dropdown-link-disabled-color !global; // $gray-500
992995

993-
// $dropdown-item-padding-y: $spacer / 4; $dropdown-item-padding-y: $dropdown-item-padding-y !global; // $spacer / 4
996+
// $dropdown-item-padding-y: $spacer * .25; $dropdown-item-padding-y: $dropdown-item-padding-y !global; // $spacer * .25
994997
// $dropdown-item-padding-x: $spacer; $dropdown-item-padding-x: $dropdown-item-padding-x !global; // $spacer
995998

996999
// $dropdown-header-color: $gray-600; $dropdown-header-color: $dropdown-header-color !global; // $gray-600
@@ -1052,12 +1055,12 @@
10521055

10531056
// $card-spacer-y: $spacer; $card-spacer-y: $card-spacer-y !global; // $spacer
10541057
// $card-spacer-x: $spacer; $card-spacer-x: $card-spacer-x !global; // $spacer
1055-
// $card-title-spacer-y: $spacer / 2; $card-title-spacer-y: $card-title-spacer-y !global; // $spacer / 2
1058+
// $card-title-spacer-y: $spacer * .5; $card-title-spacer-y: $card-title-spacer-y !global; // $spacer * .5
10561059
// $card-border-width: $border-width; $card-border-width: $card-border-width !global; // $border-width
10571060
// $card-border-radius: $border-radius; $card-border-radius: $card-border-radius !global; // $border-radius
10581061
// $card-border-color: rgba($black, .125); $card-border-color: $card-border-color !global; // rgba($black, .125)
10591062
// $card-inner-border-radius: subtract($card-border-radius, $card-border-width); $card-inner-border-radius: $card-inner-border-radius !global; // subtract($card-border-radius, $card-border-width)
1060-
// $card-cap-padding-y: $card-spacer-y / 2; $card-cap-padding-y: $card-cap-padding-y !global; // $card-spacer-y / 2
1063+
// $card-cap-padding-y: $card-spacer-y * .5; $card-cap-padding-y: $card-cap-padding-y !global; // $card-spacer-y * .5
10611064
// $card-cap-padding-x: $card-spacer-x; $card-cap-padding-x: $card-cap-padding-x !global; // $card-spacer-x
10621065
// $card-cap-bg: rgba($black, .03); $card-cap-bg: $card-cap-bg !global; // rgba($black, .03)
10631066
// $card-cap-color: null; $card-cap-color: $card-cap-color !global; // null
@@ -1067,7 +1070,7 @@
10671070

10681071
// $card-img-overlay-padding: $spacer; $card-img-overlay-padding: $card-img-overlay-padding !global; // $spacer
10691072

1070-
// $card-group-margin: $grid-gutter-width / 2; $card-group-margin: $card-group-margin !global; // $grid-gutter-width / 2
1073+
// $card-group-margin: $grid-gutter-width * .5; $card-group-margin: $card-group-margin !global; // $grid-gutter-width * .5
10711074

10721075
// Accordion
10731076
// $accordion-padding-y: 1rem; $accordion-padding-y: $accordion-padding-y !global; // 1rem
@@ -1110,8 +1113,8 @@
11101113
// $tooltip-bg: $black; $tooltip-bg: $tooltip-bg !global; // $black
11111114
// $tooltip-border-radius: $border-radius; $tooltip-border-radius: $tooltip-border-radius !global; // $border-radius
11121115
// $tooltip-opacity: .9; $tooltip-opacity: $tooltip-opacity !global; // .9
1113-
// $tooltip-padding-y: $spacer / 4; $tooltip-padding-y: $tooltip-padding-y !global; // $spacer / 4
1114-
// $tooltip-padding-x: $spacer / 2; $tooltip-padding-x: $tooltip-padding-x !global; // $spacer / 2
1116+
// $tooltip-padding-y: $spacer * .25; $tooltip-padding-y: $tooltip-padding-y !global; // $spacer * .25
1117+
// $tooltip-padding-x: $spacer * .5; $tooltip-padding-x: $tooltip-padding-x !global; // $spacer * .5
11151118
// $tooltip-margin: 0; $tooltip-margin: $tooltip-margin !global; // 0
11161119

11171120
// $tooltip-arrow-width: .8rem; $tooltip-arrow-width: $tooltip-arrow-width !global; // .8rem
@@ -1263,7 +1266,7 @@
12631266
// $list-group-border-width: $border-width; $list-group-border-width: $list-group-border-width !global; // $border-width
12641267
// $list-group-border-radius: $border-radius; $list-group-border-radius: $list-group-border-radius !global; // $border-radius
12651268

1266-
// $list-group-item-padding-y: $spacer / 2; $list-group-item-padding-y: $list-group-item-padding-y !global; // $spacer / 2
1269+
// $list-group-item-padding-y: $spacer * .5; $list-group-item-padding-y: $list-group-item-padding-y !global; // $spacer * .5
12671270
// $list-group-item-padding-x: $spacer; $list-group-item-padding-x: $list-group-item-padding-x !global; // $spacer
12681271
// $list-group-item-bg-scale: -80%; $list-group-item-bg-scale: $list-group-item-bg-scale !global; // -80%
12691272
// $list-group-item-color-scale: 40%; $list-group-item-color-scale: $list-group-item-color-scale !global; // 40%

src/scss/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
/*!
18-
* Bootstrap v5.0.1 (https://getbootstrap.com/)
18+
* Bootstrap v5.0.2 (https://getbootstrap.com/)
1919
* Copyright 2011-2021 The Bootstrap Authors
2020
* Copyright 2011-2021 Twitter, Inc.
2121
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

0 commit comments

Comments
 (0)