Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull request #1

Merged
merged 38 commits into from
Mar 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6ecd1c6
Change the name of the `Offcanvas` constructor (#33261)
rohit2sharma95 Mar 16, 2021
d491c29
prevent tooltip from being deleted on quick re-activations
RyanBerliner Mar 6, 2021
6ef70b3
prevent quick interactions from misplacing tooltips
RyanBerliner Mar 6, 2021
72d2313
reuse existing popper on show during tooltip fadeout
RyanBerliner Mar 7, 2021
99b2c0b
only trigger tooltip inserted event on true dom insert
RyanBerliner Mar 7, 2021
af42557
Update modal's `show` method to accept `relatedTarget` as an argument…
Mar 16, 2021
8d9c628
Bump karma-rollup-preprocessor from 7.0.6 to 7.0.7 (#33373)
dependabot[bot] Mar 16, 2021
ebb445b
Bump postcss from 8.2.7 to 8.2.8 (#33375)
dependabot[bot] Mar 16, 2021
5242f12
Bump eslint from 7.21.0 to 7.22.0 (#33376)
dependabot[bot] Mar 16, 2021
7a20375
Bump rollup from 2.41.0 to 2.41.3 (#33377)
dependabot[bot] Mar 16, 2021
1e14a0e
Bump karma from 6.1.2 to 6.2.0 (#33374)
dependabot[bot] Mar 16, 2021
ddf72bc
Accept data-bs-body option in the configuration object as well (#33248)
GeoSot Mar 16, 2021
6ed439f
Updates customize Sass docs to reflect proper placement of default va…
mdo Mar 16, 2021
fcac2e3
Add example: toggle modal dialogs (#33301)
Mar 17, 2021
c198eb6
Revamp accordion borders to fix pixel jumping (#33149)
mdo Mar 17, 2021
c5083d5
Use more safe check for 'isDisabled' helper (#33385)
GeoSot Mar 17, 2021
b9f3090
Fix carousel RTL and refactor code, fix rtl swipe issues (#32913)
GeoSot Mar 17, 2021
3ce0a8d
Dynamic tab should not show when triggered on `disabled` element (#33…
patrickhlauke Mar 17, 2021
72ef1df
Update unit tests for Popper V2 (#32662)
rohit2sharma95 Mar 17, 2021
26d8955
Utilities to Utilities API (Borders doc page) (#33380)
semihraifgurel Mar 17, 2021
a88d61d
BrowserStack: test on iPhone 12 (#33398)
XhmikosR Mar 18, 2021
f4f6877
.browserslistrc: remove the Edge workaround. (#33397)
XhmikosR Mar 18, 2021
df2d5b6
README.md: use shields.io for the tests badge too (#33401)
XhmikosR Mar 18, 2021
e775c49
Fix flush accordion styles
mdo Mar 22, 2021
a3ad732
Update examples (#33214)
mdo Mar 22, 2021
d9da43f
.browserslistrc: remove Android and make Safari/iOS 12 the minimum (#…
XhmikosR Mar 22, 2021
1c02ef4
Allow offcanvas to be initialized in open state (#33382)
GeoSot Mar 23, 2021
b2deaa9
Add link to new Parcel guide in starter template (#33430)
mdo Mar 23, 2021
7c67a9a
Bump clean-css-cli from 5.2.1 to 5.2.2 (#33433)
dependabot[bot] Mar 23, 2021
a827602
Bump rollup from 2.41.3 to 2.42.3 (#33432)
dependabot[bot] Mar 23, 2021
19fa62d
Bump globby from 11.0.2 to 11.0.3 (#33434)
dependabot[bot] Mar 23, 2021
296c313
Bump hugo-bin from 0.69.0 to 0.70.0 (#33436)
dependabot[bot] Mar 23, 2021
b455390
Bump @babel/preset-env from 7.13.10 to 7.13.12 (#33438)
dependabot[bot] Mar 23, 2021
9667438
Bump eslint-plugin-unicorn from 28.0.2 to 29.0.0 (#33435)
dependabot[bot] Mar 23, 2021
16bc47d
Allow data-toggle="dropdown" and form click events to bubble
caseyjhol Jan 6, 2021
69b9d63
offcanvas-navbar: add missing redirect (#33443)
XhmikosR Mar 23, 2021
220139a
Release v5.0.0-beta3 (#33439)
XhmikosR Mar 23, 2021
232e392
Make offcanvas example fully static (#33446)
mdo Mar 23, 2021
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
8 changes: 2 additions & 6 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ last 2 major versions
not dead
Chrome >= 60
Firefox >= 60
# needed since Legacy Edge still has usage; 79 was the first Chromium Edge version
# should be removed in the future when its usage drops or when it's moved to dead browsers
not Edge < 79
Firefox ESR
iOS >= 10
Safari >= 10
Android >= 6
iOS >= 12
Safari >= 12
not Explorer <= 11
12 changes: 6 additions & 6 deletions .bundlewatch.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@
},
{
"path": "./dist/js/bootstrap.bundle.js",
"maxSize": "43 kB"
"maxSize": "41 kB"
},
{
"path": "./dist/js/bootstrap.bundle.min.js",
"maxSize": "22.5 kB"
"maxSize": "22 kB"
},
{
"path": "./dist/js/bootstrap.esm.js",
"maxSize": "28.5 kB"
"maxSize": "27 kB"
},
{
"path": "./dist/js/bootstrap.esm.min.js",
"maxSize": "19 kB"
"maxSize": "18 kB"
},
{
"path": "./dist/js/bootstrap.js",
"maxSize": "29 kB"
"maxSize": "27 kB"
},
{
"path": "./dist/js/bootstrap.min.js",
"maxSize": "16.25 kB"
"maxSize": "15.75 kB"
}
],
"ci": {
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ Our default branch is for development of our upcoming Bootstrap 5 release. Head

Several quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.0-beta2.zip)
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.0-beta3.zip)
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@next`
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@next`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0-beta2`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0-beta3`
- 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/5.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
Expand All @@ -59,7 +59,7 @@ Read the [Getting started page](https://getbootstrap.com/docs/5.0/getting-starte
## Status

[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com/)
[![Build Status](https://github.com/twbs/bootstrap/workflows/JS%20Tests/badge.svg?branch=main)](https://github.com/twbs/bootstrap/actions?query=workflow%3AJS+Tests+branch%3Amain)
[![Build Status](https://img.shields.io/github/workflow/status/twbs/bootstrap/JS%20Tests/main?label=JS%20Tests&logo=github)](https://github.com/twbs/bootstrap/actions?query=workflow%3AJS+Tests+branch%3Amain)
[![npm version](https://img.shields.io/npm/v/bootstrap)](https://www.npmjs.com/package/bootstrap)
[![Gem version](https://img.shields.io/gem/v/bootstrap)](https://rubygems.org/gems/bootstrap)
[![Meteor Atmosphere](https://img.shields.io/badge/meteor-twbs%3Abootstrap-blue)](https://atmospherejs.com/twbs/bootstrap)
Expand Down
4 changes: 2 additions & 2 deletions build/build-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const bsPlugins = {
Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
Modal: path.resolve(__dirname, '../js/src/modal.js'),
OffCanvas: path.resolve(__dirname, '../js/src/offcanvas.js'),
Offcanvas: path.resolve(__dirname, '../js/src/offcanvas.js'),
Popover: path.resolve(__dirname, '../js/src/popover.js'),
ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy.js'),
Tab: path.resolve(__dirname, '../js/src/tab.js'),
Expand Down Expand Up @@ -72,7 +72,7 @@ const getConfigByPluginKey = pluginKey => {
}
}

if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'OffCanvas') {
if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'Offcanvas') {
return defaultPluginConfig
}

Expand Down
26 changes: 13 additions & 13 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ params:
social_image_path: /docs/5.0/assets/brand/bootstrap-social.png
social_logo_path: /docs/5.0/assets/brand/bootstrap-social-logo.png

current_version: "5.0.0-beta2"
current_ruby_version: "5.0.0.beta2"
current_version: "5.0.0-beta3"
current_ruby_version: "5.0.0.beta3"
docs_version: "5.0"
rfs_version: "9.0.3"
github_org: "https://github.com/twbs"
Expand All @@ -61,19 +61,19 @@ params:
icons: "https://icons.getbootstrap.com/"

download:
source: "https://github.com/twbs/bootstrap/archive/v5.0.0-beta2.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-beta2/bootstrap-5.0.0-beta2-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-beta2/bootstrap-5.0.0-beta2-examples.zip"
source: "https://github.com/twbs/bootstrap/archive/v5.0.0-beta3.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-beta3/bootstrap-5.0.0-beta3-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-beta3/bootstrap-5.0.0-beta3-examples.zip"

cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/css/bootstrap.min.css"
css_hash: "sha384-BmbxuPwQa2lc/FVzBcNJ7UAyJxM6wuqIj61tLrc4wSX0szH/Ev+nYRRuWlolflfl"
css_rtl: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/css/bootstrap.rtl.min.css"
css_rtl_hash: "sha384-4dNpRvNX0c/TdYEbYup8qbjvjaMrgUPh+g4I03CnNtANuv+VAvPL6LqdwzZKV38G"
js: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.min.js"
js_hash: "sha384-nsg8ua9HAw1y0W1btsyWgBklPnCUAFLuTMS2G72MMONqmOymq585AcH49TLBQObG"
js_bundle: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
css: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css"
css_hash: "sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6"
css_rtl: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.rtl.min.css"
css_rtl_hash: "sha384-trxYGD5BY4TyBTvU5H23FalSCYwpLA0vWEvXXGm5eytyztxb+97WzzY+IWDOSbav"
js: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.min.js"
js_hash: "sha384-j0CNLUeiqtyaRmlzUHCPZ+Gy5fQu0dQ6eZ/xAww941Ai1SxSY+0EQqNXNE6DZiVc"
js_bundle: "https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf"
popper: "https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.1/dist/umd/popper.min.js"
popper_hash: "sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG"
2 changes: 1 addition & 1 deletion 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.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.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-grid.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.rtl.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.rtl.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.rtl.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-grid.rtl.min.css.map

Large diffs are not rendered by default.

10 changes: 4 additions & 6 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.

4 changes: 2 additions & 2 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.

10 changes: 4 additions & 6 deletions dist/css/bootstrap-reboot.rtl.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.rtl.css.map

Large diffs are not rendered by default.

Loading