diff --git a/README.md b/README.md index 5e01cff2ef..36beccd3f3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- Bootstrap logo + Bootstrap logo

@@ -9,7 +9,7 @@

Sleek, intuitive, and powerful front-end framework for faster and easier web development.
- Explore Bootstrap docs » + Explore Bootstrap docs »

Report bug @@ -41,14 +41,14 @@ Several quick start options are available: -- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.4.1.zip) +- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.5.0.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.4.1` -- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.4.1` +- 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 [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass` -Read the [Getting started page](https://getbootstrap.com/docs/4.4/getting-started/introduction/) for information on the framework contents, templates and examples, and more. +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. ## Status @@ -113,11 +113,11 @@ Have a bug or a feature request? Please first read the [issue guidelines](https: Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at . The docs may also be run locally. -Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/docs/4.4/assets/js/src/search.js` file. +Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/docs/4.5/assets/js/src/search.js` file. ### Running documentation locally -1. Run through the [tooling setup](https://getbootstrap.com/docs/4.4/getting-started/build-tools/#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`. +1. Run through the [tooling setup](https://getbootstrap.com/docs/4.5/getting-started/build-tools/#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`. 2. Run `npm install` to install Node.js dependencies. 3. Run `npm start` to compile CSS and JavaScript files, generate our docs, and watch for changes. 4. Open `http://localhost:9001` in your browser, and voilà. diff --git a/_config.yml b/_config.yml index 8cc414d226..33e6c9bd07 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,7 @@ baseurl: "" url: "https://getbootstrap.com" encoding: UTF-8 exclude: - - docs/4.4/assets/scss/ + - docs/4.5/assets/scss/ plugins: - jekyll-redirect-from @@ -32,13 +32,13 @@ title: Bootstrap description: "The most popular HTML, CSS, and JS library in the world." twitter: getbootstrap authors: "Mark Otto, Jacob Thornton, and Bootstrap contributors" -social_image_path: /docs/4.4/assets/brand/bootstrap-social.png -social_logo_path: /docs/4.4/assets/brand/bootstrap-social-logo.png +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.4.1 -current_ruby_version: 4.4.1 -docs_version: 4.4 +current_version: 4.5.0 +current_ruby_version: 4.5.0 +docs_version: 4.5 github_org: "https://github.com/twbs" repo: "https://github.com/twbs/bootstrap" slack: "https://bootstrap-slack.herokuapp.com" @@ -49,17 +49,17 @@ themes: "https://themes.getbootstrap.com" icons: "https://icons.getbootstrap.com" download: - source: "https://github.com/twbs/bootstrap/archive/v4.4.1.zip" - dist: "https://github.com/twbs/bootstrap/releases/download/v4.4.1/bootstrap-4.4.1-dist.zip" - dist_examples: "https://github.com/twbs/bootstrap/releases/download/v4.4.1/bootstrap-4.4.1-examples.zip" + 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" cdn: # See https://www.srihash.org for info on how to generate the hashes - css: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" + css: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" css_hash: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" - js: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" + js: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" js_hash: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" - js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js" + js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.bundle.min.js" js_bundle_hash: "sha384-6khuMg9gaYr5AxOqhkVIODVIvm9ynTT5J4V1cfthmT+emCG6yVmEZsRHdxlotUnm" jquery: "https://code.jquery.com/jquery-3.5.1.slim.min.js" jquery_hash: "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" diff --git a/js/src/alert.js b/js/src/alert.js index 6d961670ff..c15460ae33 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): alert.js + * Bootstrap (v4.5.0): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'alert' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.alert' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/button.js b/js/src/button.js index 322cb1066c..0da2545119 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): button.js + * Bootstrap (v4.5.0): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ import $ from 'jquery' */ const NAME = 'button' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.button' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/carousel.js b/js/src/carousel.js index 7dc36ca023..4efea1021e 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): carousel.js + * Bootstrap (v4.5.0): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'carousel' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.carousel' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/collapse.js b/js/src/collapse.js index a5b8732646..270eb85e23 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): collapse.js + * Bootstrap (v4.5.0): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'collapse' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.collapse' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/dropdown.js b/js/src/dropdown.js index d32fc74af3..cba645a7ae 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): dropdown.js + * Bootstrap (v4.5.0): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ import Util from './util' */ const NAME = 'dropdown' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.dropdown' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/index.js b/js/src/index.js index dbba72db3a..1caed5020a 100644 --- a/js/src/index.js +++ b/js/src/index.js @@ -13,7 +13,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): index.js + * Bootstrap (v4.5.0): index.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/js/src/modal.js b/js/src/modal.js index 309d6d73ac..7338ffd376 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): modal.js + * Bootstrap (v4.5.0): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'modal' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.modal' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/popover.js b/js/src/popover.js index 8e6ed62067..95e9edc748 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): popover.js + * Bootstrap (v4.5.0): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Tooltip from './tooltip' */ const NAME = 'popover' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.popover' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 8506d8e05c..2413d04a54 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): scrollspy.js + * Bootstrap (v4.5.0): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'scrollspy' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.scrollspy' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/tab.js b/js/src/tab.js index cc79c194f8..5cccb10032 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): tab.js + * Bootstrap (v4.5.0): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'tab' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.tab' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/toast.js b/js/src/toast.js index 04321a228b..f7e58d98dd 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): toast.js + * Bootstrap (v4.5.0): toast.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ import Util from './util' */ const NAME = 'toast' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.toast' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/tools/sanitizer.js b/js/src/tools/sanitizer.js index 4ff3f7aa68..e57f856f0f 100644 --- a/js/src/tools/sanitizer.js +++ b/js/src/tools/sanitizer.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): tools/sanitizer.js + * Bootstrap (v4.5.0): tools/sanitizer.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/js/src/tooltip.js b/js/src/tooltip.js index b1990294e4..6753c4c152 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): tooltip.js + * Bootstrap (v4.5.0): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ import Util from './util' */ const NAME = 'tooltip' -const VERSION = '4.4.1' +const VERSION = '4.5.0' const DATA_KEY = 'bs.tooltip' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/util.js b/js/src/util.js index c8168c4758..e88feb5647 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.4.1): util.js + * Bootstrap (v4.5.0): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/package-lock.json b/package-lock.json index cee400e97d..93bb1b851b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "4.4.1", + "version": "4.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.js b/package.js index c9839129a5..624c30a92f 100644 --- a/package.js +++ b/package.js @@ -3,7 +3,7 @@ Package.describe({ name: 'twbs:bootstrap', // https://atmospherejs.com/twbs/bootstrap summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.', - version: '4.4.1', + version: '4.5.0', git: 'https://github.com/twbs/bootstrap.git' }); diff --git a/package.json b/package.json index 4a38313eac..2769e7b163 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "4.4.1", - "version_short": "4.4", + "version": "4.5.0", + "version_short": "4.5", "keywords": [ "css", "sass", diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index a00f9272ce..4109e4fbd7 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v4.4.1 (https://getbootstrap.com/) + * Bootstrap Grid v4.5.0 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 9f04c0752b..e61235ac64 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v4.4.1 (https://getbootstrap.com/) + * Bootstrap Reboot v4.5.0 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index aa02ac5d49..8ae96deb9d 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.4.1 (https://getbootstrap.com/) + * Bootstrap v4.5.0 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/mixins/_background-variant.scss b/scss/mixins/_background-variant.scss index 458e66ac83..80580189ad 100644 --- a/scss/mixins/_background-variant.scss +++ b/scss/mixins/_background-variant.scss @@ -19,5 +19,5 @@ #{$parent} { background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important; } - @include deprecate("The `bg-gradient-variant` mixin", "v4.4.2", "v5", $ignore-warning); + @include deprecate("The `bg-gradient-variant` mixin", "v4.5.0", "v5", $ignore-warning); } diff --git a/site/_data/docs-versions.yml b/site/_data/docs-versions.yml index f5ba3df810..ffbb7400d3 100644 --- a/site/_data/docs-versions.yml +++ b/site/_data/docs-versions.yml @@ -36,10 +36,11 @@ - group: v4.x baseurl: https://getbootstrap.com/docs - description: Current major release with two minor releases. Last update was v4.4.1. + description: Current major release with two minor releases. Last update was v4.5.0. versions: - v: 4.0 - v: 4.1 - v: 4.2 - v: 4.3 - v: 4.4 + - v: 4.5 diff --git a/site/_includes/docs-navbar.html b/site/_includes/docs-navbar.html index d69d1ee93a..aa77be0f06 100644 --- a/site/_includes/docs-navbar.html +++ b/site/_includes/docs-navbar.html @@ -35,7 +35,7 @@ v{{ site.docs_version }}