Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: twbs/bootstrap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.5.1
Choose a base ref
...
head repository: twbs/bootstrap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.5.2
Choose a head ref
  • 5 commits
  • 70 files changed
  • 3 contributors

Commits on Aug 6, 2020

  1. Remove flex: 1 0 100% from rows (#31439) (#31445) 

    Co-authored-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Mark Otto <markd.otto@gmail.com>
    @XhmikosR @mdo
    XhmikosR and mdo authored Aug 6, 2020
    Copy the full SHA
    f083759 View commit details

  2. Restore make-container-max-widths mixin

    @mdo @XhmikosR
    mdo authored and XhmikosR committed Aug 6, 2020
    Copy the full SHA
    af4419b View commit details

  3. Deprecate the make-container-max-widths mixin

    @XhmikosR
    XhmikosR committed Aug 6, 2020
    Copy the full SHA
    e6ab4ad View commit details

  4. Remove undefined $ignore-warning

    @MartijnCuppens @XhmikosR
    MartijnCuppens authored and XhmikosR committed Aug 6, 2020
    Copy the full SHA
    c0aa405 View commit details

  5. Prepare v4.5.2. (#31444)

    @XhmikosR
    XhmikosR authored Aug 6, 2020
    Copy the full SHA
    5f2480a View commit details
Showing with 145 additions and 140 deletions.
  1. +3 −3 README.md
  2. +11 −11 _config.yml
  3. +1 −3 dist/css/bootstrap-grid.css
  4. +1 −1 dist/css/bootstrap-grid.css.map
  5. +2 −2 dist/css/bootstrap-grid.min.css
  6. +1 −1 dist/css/bootstrap-grid.min.css.map
  7. +1 −1 dist/css/bootstrap-reboot.css
  8. +1 −1 dist/css/bootstrap-reboot.css.map
  9. +1 −1 dist/css/bootstrap-reboot.min.css
  10. +1 −1 dist/css/bootstrap-reboot.min.css.map
  11. +1 −3 dist/css/bootstrap.css
  12. +1 −1 dist/css/bootstrap.css.map
  13. +2 −2 dist/css/bootstrap.min.css
  14. +1 −1 dist/css/bootstrap.min.css.map
  15. +14 −14 dist/js/bootstrap.bundle.js
  16. +1 −1 dist/js/bootstrap.bundle.js.map
  17. +2 −2 dist/js/bootstrap.bundle.min.js
  18. +1 −1 dist/js/bootstrap.bundle.min.js.map
  19. +14 −14 dist/js/bootstrap.js
  20. +1 −1 dist/js/bootstrap.js.map
  21. +2 −2 dist/js/bootstrap.min.js
  22. +1 −1 dist/js/bootstrap.min.js.map
  23. +2 −2 js/dist/alert.js
  24. +1 −1 js/dist/alert.js.map
  25. +2 −2 js/dist/button.js
  26. +1 −1 js/dist/button.js.map
  27. +2 −2 js/dist/carousel.js
  28. +1 −1 js/dist/carousel.js.map
  29. +2 −2 js/dist/collapse.js
  30. +1 −1 js/dist/collapse.js.map
  31. +2 −2 js/dist/dropdown.js
  32. +1 −1 js/dist/dropdown.js.map
  33. +2 −2 js/dist/modal.js
  34. +1 −1 js/dist/modal.js.map
  35. +2 −2 js/dist/popover.js
  36. +1 −1 js/dist/popover.js.map
  37. +2 −2 js/dist/scrollspy.js
  38. +1 −1 js/dist/scrollspy.js.map
  39. +2 −2 js/dist/tab.js
  40. +1 −1 js/dist/tab.js.map
  41. +2 −2 js/dist/toast.js
  42. +1 −1 js/dist/toast.js.map
  43. +3 −3 js/dist/tooltip.js
  44. +1 −1 js/dist/tooltip.js.map
  45. +2 −2 js/dist/util.js
  46. +1 −1 js/dist/util.js.map
  47. +2 −2 js/src/alert.js
  48. +2 −2 js/src/button.js
  49. +2 −2 js/src/carousel.js
  50. +2 −2 js/src/collapse.js
  51. +2 −2 js/src/dropdown.js
  52. +1 −1 js/src/index.js
  53. +2 −2 js/src/modal.js
  54. +2 −2 js/src/popover.js
  55. +2 −2 js/src/scrollspy.js
  56. +2 −2 js/src/tab.js
  57. +2 −2 js/src/toast.js
  58. +1 −1 js/src/tools/sanitizer.js
  59. +2 −2 js/src/tooltip.js
  60. +1 −1 js/src/util.js
  61. +1 −1 package-lock.json
  62. +1 −1 package.js
  63. +1 −1 package.json
  64. +1 −1 scss/bootstrap-grid.scss
  65. +1 −1 scss/bootstrap-reboot.scss
  66. +1 −1 scss/bootstrap.scss
  67. +10 −1 scss/mixins/_grid.scss
  68. +1 −1 site/_data/docs-versions.yml
  69. +1 −1 site/docs/4.5/assets/css/docs.min.css
  70. +1 −1 site/docs/4.5/assets/css/docs.min.css.map
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -41,11 +41,11 @@

Several quick start options are available:

- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.5.1.zip)
- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.5.2.zip)
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap`
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.5.1`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.5.1`
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.5.2`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.5.2`
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`

Read the [Getting started page](https://getbootstrap.com/docs/4.5/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
22 changes: 11 additions & 11 deletions _config.yml
View file
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@ social_image_path: /docs/4.5/assets/brand/bootstrap-social.png
social_logo_path: /docs/4.5/assets/brand/bootstrap-social-logo.png

# Custom variables
current_version: 4.5.1
current_ruby_version: 4.5.1
current_version: 4.5.2
current_ruby_version: 4.5.2
docs_version: 4.5
github_org: "https://github.com/twbs"
repo: "https://github.com/twbs/bootstrap"
@@ -49,18 +49,18 @@ themes: "https://themes.getbootstrap.com"
icons: "https://icons.getbootstrap.com"

download:
source: "https://github.com/twbs/bootstrap/archive/v4.5.1.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v4.5.1/bootstrap-4.5.1-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v4.5.1/bootstrap-4.5.1-examples.zip"
source: "https://github.com/twbs/bootstrap/archive/v4.5.2.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v4.5.2/bootstrap-4.5.2-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v4.5.2/bootstrap-4.5.2-examples.zip"

cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.1/css/bootstrap.min.css"
css_hash: "sha384-VCmXjywReHh4PwowAiWNagnWcLhlEJLA5buUprzK8rxFgeH0kww/aWY76TfkUoSX"
js: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.1/js/bootstrap.min.js"
js_hash: "sha384-XEerZL0cuoUbHE4nZReLT7nx9gQrQreJekYhJD9WNWhH8nEW+0c5qq7aIo2Wl30J"
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.1/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-FxkQtQ8fW6C3xA7BoW8ocAb2N7U9dCA7ZJXMJlz/37PL6Q6PUGQ5ZeJcaXdYKcdJ"
css: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"
css_hash: "sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z"
js: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"
js_hash: "sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV"
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-LtrjvnR4Twt/qOuYxE721u19sVFLVSA4hf/rRt6PrZTmiPltdZcI7q7PXQBYTKyf"
jquery: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
jquery_hash: "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
popper: "https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
4 changes: 1 addition & 3 deletions dist/css/bootstrap-grid.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.css.map
View file

Large diffs are not rendered by default.

Loading