Skip to content

Commit

Permalink
Bootstrap 4.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@benabraham
benabraham committed Oct 29, 2021
1 parent 4f8eb7b commit 4aa7efb
Show file tree
Hide file tree
Showing 6 changed files with 611 additions and 605 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"main": "index.js",
"devDependencies": {
"autoprefixer": "^10.2.5",
"bootstrap": "4.6.0",
"bootstrap": "4.6.1",
"browser-sync": "^2.26.14",
"del": "^6.0.0",
"esm": "^3.2.25",
Expand Down
2 changes: 1 addition & 1 deletion src/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"bootstrapVersion": "4.6.0",
"bootstrapVersion": "4.6.1",
"sampleColors": [
{
"name": "red",
Expand Down
15 changes: 8 additions & 7 deletions src/scss/_4-custom-bootstrap-variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
// $h5-font-size: $font-size-base * 1.25; $h5-font-size: $h5-font-size !global; // $font-size-base * 1.25
// $h6-font-size: $font-size-base; $h6-font-size: $h6-font-size !global; // $font-size-base

// $headings-margin-bottom: $spacer / 2; $headings-margin-bottom: $headings-margin-bottom !global; // $spacer / 2
// $headings-margin-bottom: $spacer * .5; $headings-margin-bottom: $headings-margin-bottom !global; // $spacer * .5
// $headings-font-family: null; $headings-font-family: $headings-font-family !global; // null
// $headings-font-weight: 500; $headings-font-weight: $headings-font-weight !global; // 500
// $headings-line-height: 1.2; $headings-line-height: $headings-line-height !global; // 1.2
Expand Down Expand Up @@ -548,7 +548,7 @@

// $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)
// $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)
// $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)
// $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)

// $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))
// $input-height-sm: add($input-line-height-sm * 1em, add($input-padding-y-sm * 2, $input-height-border, false)); $input-height-sm: $input-height-sm !global; // add($input-line-height-sm * 1em, add($input-padding-y-sm * 2, $input-height-border, false))
Expand Down Expand Up @@ -618,7 +618,7 @@
// $custom-radio-indicator-icon-checked: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'><circle r='3' fill='#{$custom-control-indicator-checked-color}'/></svg>"); $custom-radio-indicator-icon-checked: $custom-radio-indicator-icon-checked !global; // url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'><circle r='3' fill='#{$custom-control-indicator-checked-color}'/></svg>")

// $custom-switch-width: $custom-control-indicator-size * 1.75; $custom-switch-width: $custom-switch-width !global; // $custom-control-indicator-size * 1.75
// $custom-switch-indicator-border-radius: $custom-control-indicator-size / 2; $custom-switch-indicator-border-radius: $custom-switch-indicator-border-radius !global; // $custom-control-indicator-size / 2
// $custom-switch-indicator-border-radius: $custom-control-indicator-size * .5; $custom-switch-indicator-border-radius: $custom-switch-indicator-border-radius !global; // $custom-control-indicator-size * .5
// $custom-switch-indicator-size: subtract($custom-control-indicator-size, $custom-control-indicator-border-width * 4); $custom-switch-indicator-size: $custom-switch-indicator-size !global; // subtract($custom-control-indicator-size, $custom-control-indicator-border-width * 4)

// $custom-select-padding-y: $input-padding-y; $custom-select-padding-y: $custom-select-padding-y !global; // $input-padding-y
Expand Down Expand Up @@ -761,12 +761,12 @@
// $nav-pills-link-active-bg: $component-active-bg; $nav-pills-link-active-bg: $nav-pills-link-active-bg !global; // $component-active-bg

// $nav-divider-color: $gray-200; $nav-divider-color: $nav-divider-color !global; // $gray-200
// $nav-divider-margin-y: $spacer / 2; $nav-divider-margin-y: $nav-divider-margin-y !global; // $spacer / 2
// $nav-divider-margin-y: $spacer * .5; $nav-divider-margin-y: $nav-divider-margin-y !global; // $spacer * .5


// Navbar

// $navbar-padding-y: $spacer / 2; $navbar-padding-y: $navbar-padding-y !global; // $spacer / 2
// $navbar-padding-y: $spacer * .5; $navbar-padding-y: $navbar-padding-y !global; // $spacer * .5
// $navbar-padding-x: $spacer; $navbar-padding-x: $navbar-padding-x !global; // $spacer

// $navbar-nav-link-padding-x: .5rem; $navbar-nav-link-padding-x: $navbar-nav-link-padding-x !global; // .5rem
Expand All @@ -775,7 +775,7 @@
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
// $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
// $navbar-brand-height: $navbar-brand-font-size * $line-height-base; $navbar-brand-height: $navbar-brand-height !global; // $navbar-brand-font-size * $line-height-base
// $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
// $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

// $navbar-toggler-padding-y: .25rem; $navbar-toggler-padding-y: $navbar-toggler-padding-y !global; // .25rem
// $navbar-toggler-padding-x: .75rem; $navbar-toggler-padding-x: $navbar-toggler-padding-x !global; // .75rem
Expand Down Expand Up @@ -895,7 +895,7 @@

// $card-img-overlay-padding: 1.25rem; $card-img-overlay-padding: $card-img-overlay-padding !global; // 1.25rem

// $card-group-margin: $grid-gutter-width / 2; $card-group-margin: $card-group-margin !global; // $grid-gutter-width / 2
// $card-group-margin: $grid-gutter-width * .5; $card-group-margin: $card-group-margin !global; // $grid-gutter-width * .5
// $card-deck-margin: $card-group-margin; $card-deck-margin: $card-deck-margin !global; // $card-group-margin

// $card-columns-count: 3; $card-columns-count: $card-columns-count !global; // 3
Expand Down Expand Up @@ -1153,6 +1153,7 @@

// $spinner-width: 2rem; $spinner-width: $spinner-width !global; // 2rem
// $spinner-height: $spinner-width; $spinner-height: $spinner-height !global; // $spinner-width
// $spinner-vertical-align: -.125em; $spinner-vertical-align: $spinner-vertical-align !global; // -.125em
// $spinner-border-width: .25em; $spinner-border-width: $spinner-border-width !global; // .25em

// $spinner-width-sm: 1rem; $spinner-width-sm: $spinner-width-sm !global; // 1rem
Expand Down
Loading

1 comment on commit 4aa7efb

@r-srb
Copy link

@r-srb r-srb commented on 4aa7efb Apr 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vymaz.txt

Please # to comment.