Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b2ef98f
Remove backdrop-filter from toasts
mdo Jun 25, 2020
c49b084
BrowserStack: test on Edge 15
XhmikosR Jun 25, 2020
234dd96
Backport #31135
XhmikosR Jun 25, 2020
ea01c29
Backport #30326
XhmikosR Jun 25, 2020
9a6cfeb
Backport #30326 (Unit test)
ysds Jun 25, 2020
ad8d3a6
Update Babel config (#31011)
XhmikosR Jun 25, 2020
f40e1b6
Update devDependencies and gems
XhmikosR Jul 6, 2020
38bcf10
Update dependencies, gems and regenerate package-lock.json (#31261)
XhmikosR Jul 9, 2020
99013a5
Docs: forms accessibility cleanup (backport from v5) (#31234)
patrickhlauke Jul 12, 2020
cc49a5b
Turn off scroll anchoring for accordions (#31347)
patrickhlauke Jul 21, 2020
0ec2ce4
Update to Ruby 2.7/Bundler 2.x. (#31296)
XhmikosR Aug 2, 2020
f530ab7
Clear timeout before showing the toast (#31155)
rohit2sharma95 Jul 11, 2020
1abe926
Add unit test for toast to check clearTimeout to have been called (#3…
rohit2sharma95 Jul 15, 2020
81d3e2b
docs(skippy): prevent skip links from overlapping header
ffoodd Jul 20, 2020
d44a1e1
Backport #31344
XhmikosR Jul 21, 2020
6879a3c
Update devDependencies and gems
XhmikosR Aug 3, 2020
30d375b
Remove overflow: hidden from toasts (#31381) (#31407)
XhmikosR Aug 3, 2020
e0f89dc
Backport #31339 (#31414)
XhmikosR Aug 4, 2020
89dc975
Prepare v4.5.1. (#31408)
XhmikosR Aug 4, 2020
f083759
Remove flex: 1 0 100% from rows (#31439) (#31445)
XhmikosR Aug 6, 2020
af4419b
Restore make-container-max-widths mixin
mdo Aug 5, 2020
e6ab4ad
Deprecate the `make-container-max-widths` mixin
XhmikosR Aug 6, 2020
c0aa405
Remove undefined `$ignore-warning`
MartijnCuppens Aug 6, 2020
5f2480a
Prepare v4.5.2. (#31444)
XhmikosR Aug 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@ module.exports = {
'@babel/preset-env',
{
loose: true,
modules: false,
exclude: ['transform-typeof-symbol']
bugfixes: true,
modules: false
}
]
],
plugins: [
'@babel/plugin-proposal-object-rest-spread'
],
env: {
test: {
plugins: [ 'istanbul' ]
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push, pull_request]
env:
CI: true
NODE: 12.x
RUBY: 2.6.x
RUBY: 2.7.x

jobs:
docs:
Expand All @@ -23,8 +23,11 @@ jobs:
with:
ruby-version: ${{ env.RUBY }}

- name: Disable gem docs
run: 'echo "gem: --no-document" > ~/.gemrc'
- name: Set up Ruby env
run: |
echo "gem: --no-document" > ~/.gemrc # Disable gem docs
bundle config set clean 'true'
bundle config set deployment 'true'

- name: Set up Ruby cache
uses: actions/cache@v2
Expand All @@ -44,9 +47,6 @@ jobs:
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-

- name: Set up Bundler
run: gem install bundler -v "~> 1.17"

- run: ruby --version
- run: gem --version
- run: bundle --version
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

group :development, :test do
gem 'jekyll', '~> 4.1.0'
gem 'jekyll', '~> 4.1.1'
gem 'jekyll-redirect-from', '~> 0.16.0'
gem 'jekyll-sitemap', '~> 1.4.0'
gem 'jekyll-toc', '~> 0.14.0'
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ GEM
ffi (1.13.1-x64-mingw32)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.3)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
jekyll (4.1.0)
jekyll (4.1.1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -42,7 +42,7 @@ GEM
nokogiri (~> 1.10)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.2.1)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
Expand All @@ -52,9 +52,9 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.9)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.9-x64-mingw32)
nokogiri (1.10.10-x64-mingw32)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
Expand All @@ -63,7 +63,7 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.20.0)
rouge (3.21.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
Expand All @@ -79,11 +79,11 @@ PLATFORMS
x64-mingw32

DEPENDENCIES
jekyll (~> 4.1.0)
jekyll (~> 4.1.1)
jekyll-redirect-from (~> 0.16.0)
jekyll-sitemap (~> 1.4.0)
jekyll-toc (~> 0.14.0)
wdm (~> 0.1.1)

BUNDLED WITH
1.17.3
2.1.4
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@

Several quick start options are available:

- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.5.0.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.0`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.5.0`
- 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.
Expand Down
26 changes: 13 additions & 13 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
current_ruby_version: 4.5.0
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"
Expand All @@ -49,22 +49,22 @@ themes: "https://themes.getbootstrap.com"
icons: "https://icons.getbootstrap.com"

download:
source: "https://github.com/twbs/bootstrap/archive/v4.5.0.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v4.5.0/bootstrap-4.5.0-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v4.5.0/bootstrap-4.5.0-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.0/css/bootstrap.min.css"
css_hash: "sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk"
js: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"
js_hash: "sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI"
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-1CmrxMRARb6aLqgBO7yyAxTOQE2AKb9GfXnEo760AUcUmFx3ibVJJAzGytlQcNXd"
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.0/dist/umd/popper.min.js"
popper_hash: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
popper: "https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
popper_hash: "sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"

toc:
min_level: 2
Expand Down
4 changes: 2 additions & 2 deletions build/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const path = require('path')
const { babel } = require('@rollup/plugin-babel')
const resolve = require('@rollup/plugin-node-resolve')
const { nodeResolve } = require('@rollup/plugin-node-resolve')
const banner = require('./banner.js')

const BUNDLE = process.env.BUNDLE === 'true'
Expand All @@ -27,7 +27,7 @@ if (BUNDLE) {
// Remove last entry in external array to bundle Popper
external.pop()
delete globals['popper.js']
plugins.push(resolve())
plugins.push(nodeResolve())
}

module.exports = {
Expand Down
48 changes: 8 additions & 40 deletions dist/css/bootstrap-grid.css

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

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/css/bootstrap-grid.min.css

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/css/bootstrap-reboot.css

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-reboot.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/css/bootstrap-reboot.min.css

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-reboot.min.css.map

Large diffs are not rendered by default.

Loading