From b9e59e96afa93eb7b0606b92853d91d6ac171f4c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 15 Feb 2019 23:36:44 +0200 Subject: [PATCH] Replace `master` with `v3-dev` after the branch switch. (#28287) --- CONTRIBUTING.md | 16 ++++++++-------- Gruntfile.js | 2 +- ISSUE_TEMPLATE.md | 4 ++-- README.md | 12 ++++++------ docs/_includes/footer.html | 2 +- .../getting-started/browser-device-support.html | 8 ++++---- docs/_includes/getting-started/grunt.html | 2 +- docs/_includes/getting-started/license.html | 2 +- .../getting-started/whats-included.html | 2 +- docs/_includes/js/overview.html | 2 +- docs/assets/css/docs.css | 2 +- docs/assets/css/ie10-viewport-bug-workaround.css | 2 +- docs/assets/js/ie10-viewport-bug-workaround.js | 2 +- .../less/ie10-viewport-bug-workaround.less | 2 +- grunt/bs-commonjs-generator.js | 2 +- grunt/bs-glyphicons-data-generator.js | 2 +- grunt/bs-lessdoc-parser.js | 2 +- grunt/bs-raw-files-generator.js | 2 +- grunt/change-version.js | 2 +- grunt/generate-sri.js | 2 +- js/affix.js | 2 +- js/alert.js | 2 +- js/button.js | 2 +- js/carousel.js | 2 +- js/collapse.js | 2 +- js/dropdown.js | 2 +- js/modal.js | 2 +- js/popover.js | 2 +- js/scrollspy.js | 2 +- js/tab.js | 2 +- js/tests/README.md | 2 +- js/tests/index.html | 2 +- js/tooltip.js | 2 +- js/transition.js | 2 +- less/bootstrap.less | 2 +- less/theme.less | 2 +- nuget/bootstrap.less.nuspec | 2 +- nuget/bootstrap.nuspec | 2 +- 38 files changed, 54 insertions(+), 54 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 585787dabd..528ec3b65a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,7 +70,7 @@ Guidelines for bug reports: reported. 2. **Check if the issue has been fixed** — try to reproduce it using the - latest `master` or development branch in the repository. + latest `v3-dev` or development branch in the repository. 3. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example. @@ -157,13 +157,13 @@ project (indentation, accurate comments, etc.) and any other requirements **Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js` directly!** Those files are automatically generated. You should edit the -source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less), +source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/v3-dev/less), [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss) (for Bootstrap v4), -and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead. +and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/v3-dev/js) instead. Similarly, when contributing to Bootstrap's documentation, you should edit the documentation source files in -[the `/bootstrap/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/docs). +[the `/bootstrap/docs/` directory of the `v3-dev` branch](https://github.com/twbs/bootstrap/tree/v3-dev/docs). **Do not edit the `gh-pages` branch.** That branch is generated from the documentation source files and is managed separately by the Bootstrap Core Team. @@ -185,8 +185,8 @@ included in the project: 2. If you cloned a while ago, get the latest changes from upstream: ```bash - git checkout master - git pull upstream master + git checkout v3-dev + git pull upstream v3-dev ``` 3. Create a new topic branch (off the main project development branch) to @@ -205,7 +205,7 @@ included in the project: 5. Locally merge (or rebase) the upstream development branch into your topic branch: ```bash - git pull [--rebase] upstream master + git pull [--rebase] upstream v3-dev ``` 6. Push your topic branch up to your fork: @@ -215,7 +215,7 @@ included in the project: ``` 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) - with a clear title and description against the `master` branch. + with a clear title and description against the `v3-dev` branch. **IMPORTANT**: By submitting a patch, you agree to allow the project owners to license your work under the terms of the [MIT License](LICENSE) (if it diff --git a/Gruntfile.js b/Gruntfile.js index 05d88c2874..ccda9904e4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,7 +2,7 @@ * Bootstrap's Gruntfile * https://getbootstrap.com/ * Copyright 2013-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ module.exports = function (grunt) { diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index d7732a7927..05531a636b 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -3,12 +3,12 @@ Before opening an issue: - [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) - [Validate](https://validator.w3.org/nu/) and [lint](https://github.com/twbs/bootlint#in-the-browser) any HTML to avoid common problems - Prepare a [reduced test case](https://css-tricks.com/reduced-test-cases/) for any bugs -- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) +- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/v3-dev/CONTRIBUTING.md) When asking general "how to" questions: - Please do not open an issue here -- Instead, ask for help on [StackOverflow, IRC, or Slack](https://github.com/twbs/bootstrap/blob/master/README.md#community) +- Instead, ask for help on [StackOverflow, IRC, or Slack](https://github.com/twbs/bootstrap/blob/v3-dev/README.md#community) When reporting a bug, include: diff --git a/README.md b/README.md index f8b77ee8f4..02a5f9d03c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com/) ![Bower version](https://img.shields.io/bower/v/bootstrap.svg) [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap) -[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap) +[![Build Status](https://img.shields.io/travis/twbs/bootstrap/v3-dev.svg)](https://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies) [![NuGet](https://img.shields.io/nuget/v/bootstrap.svg)](https://www.nuget.org/packages/Bootstrap) @@ -69,7 +69,7 @@ We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified ## Bugs and feature requests -Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new). +Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/v3-dev/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new). Note that **feature requests must target [Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev),** because Bootstrap v3 is now in maintenance mode and is closed off to new features. This is so that we can focus our efforts on Bootstrap v4. @@ -96,13 +96,13 @@ Documentation for v2.3.2 has been made available for the time being at . +Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/v3-dev/.editorconfig) for easy use in common text editors. Read more and download plugins at . ## Community @@ -146,4 +146,4 @@ Thanks to [BrowserStack](https://www.browserstack.com/) for providing the infras ## Copyright and license -Code and documentation copyright 2011-2019 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). +Code and documentation copyright 2011-2019 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/v3-dev/docs/LICENSE). diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index de9af4fc65..f071685aa4 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -12,7 +12,7 @@

Designed and built with all the love in the world by @mdo and @fat. Maintained by the core team with the help of our contributors.

-

Code licensed MIT, docs CC BY 3.0.

+

Code licensed MIT, docs CC BY 3.0.

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html index bfcc00e2e9..0fc0ee4d6c 100644 --- a/docs/_includes/getting-started/browser-device-support.html +++ b/docs/_includes/getting-started/browser-device-support.html @@ -124,11 +124,11 @@

Internet Explorer 8 and Respond.js

Beware of the following caveats when using Respond.js in your development and production environments for Internet Explorer 8.

Respond.js and cross-domain CSS

-

Using Respond.js with CSS hosted on a different (sub)domain (for example, on a CDN) requires some additional setup. See the Respond.js docs for details.

+

Using Respond.js with CSS hosted on a different (sub)domain (for example, on a CDN) requires some additional setup. See the Respond.js docs for details.

Respond.js and file://

-

Due to browser security rules, Respond.js doesn't work with pages viewed via the file:// protocol (like when opening a local HTML file). To test responsive features in IE8, view your pages over HTTP(S). See the Respond.js docs for details.

+

Due to browser security rules, Respond.js doesn't work with pages viewed via the file:// protocol (like when opening a local HTML file). To test responsive features in IE8, view your pages over HTTP(S). See the Respond.js docs for details.

Respond.js and @import

-

Respond.js doesn't work with CSS that's referenced via @import. In particular, some Drupal configurations are known to use @import. See the Respond.js docs for details.

+

Respond.js doesn't work with CSS that's referenced via @import. In particular, some Drupal configurations are known to use @import. See the Respond.js docs for details.

Internet Explorer 8 and box-sizing

IE8 does not fully support box-sizing: border-box; when combined with min-width, max-width, min-height, or max-height. For that reason, as of v3.0.1, we no longer use max-width on .containers.

@@ -159,7 +159,7 @@ {% highlight js %} // Copyright 2014-2019 Twitter, Inc. -// Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) +// Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) if (navigator.userAgent.match(/IEMobile\/10\.0/)) { var msViewportStyle = document.createElement('style') msViewportStyle.appendChild( diff --git a/docs/_includes/getting-started/grunt.html b/docs/_includes/getting-started/grunt.html index 2484421896..f4e6d4ecb2 100644 --- a/docs/_includes/getting-started/grunt.html +++ b/docs/_includes/getting-started/grunt.html @@ -9,7 +9,7 @@ Then, from the command line:
  1. Install grunt-cli globally with npm install -g grunt-cli.
    2. -
  2. Navigate to the root /bootstrap/ directory, then run npm install. npm will look at the package.json file and automatically install the necessary local dependencies listed there.
    3. +
  3. Navigate to the root /bootstrap/ directory, then run npm install. npm will look at the package.json file and automatically install the necessary local dependencies listed there.

When completed, you'll be able to run the various Grunt commands provided from the command line.

diff --git a/docs/_includes/getting-started/license.html b/docs/_includes/getting-started/license.html index 06ece5c70a..190c953a2e 100644 --- a/docs/_includes/getting-started/license.html +++ b/docs/_includes/getting-started/license.html @@ -30,5 +30,5 @@
  • Submit changes that you make to Bootstrap back to the Bootstrap project (though such feedback is encouraged)
    • -

    The full Bootstrap license is located in the project repository for more information.

    +

    The full Bootstrap license is located in the project repository for more information.

    diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html index a82c11889c..eb9e648e2f 100644 --- a/docs/_includes/getting-started/whats-included.html +++ b/docs/_includes/getting-started/whats-included.html @@ -5,7 +5,7 @@

    jQuery required

    -

    Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template. Consult our bower.json to see which versions of jQuery are supported.

    +

    Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template. Consult our bower.json to see which versions of jQuery are supported.

    Precompiled Bootstrap

    diff --git a/docs/_includes/js/overview.html b/docs/_includes/js/overview.html index 911b59098d..ef7f68a8de 100644 --- a/docs/_includes/js/overview.html +++ b/docs/_includes/js/overview.html @@ -11,7 +11,7 @@

    Plugin dependencies

    -

    Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included before the plugin files). Consult our bower.json to see which versions of jQuery are supported.

    +

    Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included before the plugin files). Consult our bower.json to see which versions of jQuery are supported.

    Data attributes

    diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b9c6e860f7..0fd6e34e86 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -228,7 +228,7 @@ /*! * IE10 viewport hack for Surface/desktop Windows 8 bug * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ @-ms-viewport { width: device-width; diff --git a/docs/assets/css/ie10-viewport-bug-workaround.css b/docs/assets/css/ie10-viewport-bug-workaround.css index 666919755c..8ace1131d9 100644 --- a/docs/assets/css/ie10-viewport-bug-workaround.css +++ b/docs/assets/css/ie10-viewport-bug-workaround.css @@ -1,7 +1,7 @@ /*! * IE10 viewport hack for Surface/desktop Windows 8 bug * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ @-ms-viewport { width: device-width; diff --git a/docs/assets/js/ie10-viewport-bug-workaround.js b/docs/assets/js/ie10-viewport-bug-workaround.js index 673a71ad0b..36b6002661 100644 --- a/docs/assets/js/ie10-viewport-bug-workaround.js +++ b/docs/assets/js/ie10-viewport-bug-workaround.js @@ -1,7 +1,7 @@ /*! * IE10 viewport hack for Surface/desktop Windows 8 bug * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ // See the Getting Started docs for more information: diff --git a/docs/assets/less/ie10-viewport-bug-workaround.less b/docs/assets/less/ie10-viewport-bug-workaround.less index 7e9dc5d1f5..1827f4a25c 100644 --- a/docs/assets/less/ie10-viewport-bug-workaround.less +++ b/docs/assets/less/ie10-viewport-bug-workaround.less @@ -3,7 +3,7 @@ /*! * IE10 viewport hack for Surface/desktop Windows 8 bug * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ // See the Getting Started docs for more information: diff --git a/grunt/bs-commonjs-generator.js b/grunt/bs-commonjs-generator.js index 04e575a9ab..b9d93ce57f 100644 --- a/grunt/bs-commonjs-generator.js +++ b/grunt/bs-commonjs-generator.js @@ -2,7 +2,7 @@ * Bootstrap Grunt task for the CommonJS module generation * https://getbootstrap.com/ * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ 'use strict'; diff --git a/grunt/bs-glyphicons-data-generator.js b/grunt/bs-glyphicons-data-generator.js index a970e338e1..237a1c18d8 100644 --- a/grunt/bs-glyphicons-data-generator.js +++ b/grunt/bs-glyphicons-data-generator.js @@ -2,7 +2,7 @@ * Bootstrap Grunt task for Glyphicons data generation * https://getbootstrap.com/ * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ 'use strict'; diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js index 8fa4e763e1..7fad82824a 100644 --- a/grunt/bs-lessdoc-parser.js +++ b/grunt/bs-lessdoc-parser.js @@ -2,7 +2,7 @@ * Bootstrap Grunt task for parsing Less docstrings * https://getbootstrap.com/ * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ 'use strict'; diff --git a/grunt/bs-raw-files-generator.js b/grunt/bs-raw-files-generator.js index 744f7d77db..4ae4eeb509 100644 --- a/grunt/bs-raw-files-generator.js +++ b/grunt/bs-raw-files-generator.js @@ -2,7 +2,7 @@ * Bootstrap Grunt task for generating raw-files.min.js for the Customizer * https://getbootstrap.com/ * Copyright 2014-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ 'use strict'; diff --git a/grunt/change-version.js b/grunt/change-version.js index 6ae08c8542..4b78049adb 100755 --- a/grunt/change-version.js +++ b/grunt/change-version.js @@ -5,7 +5,7 @@ /*! * Script to update version number references in the project. * Copyright 2015-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ var fs = require('fs'); var path = require('path'); diff --git a/grunt/generate-sri.js b/grunt/generate-sri.js index 4bc7e87034..3a41b9d0a9 100644 --- a/grunt/generate-sri.js +++ b/grunt/generate-sri.js @@ -9,7 +9,7 @@ * * Copyright 2017-2019 The Bootstrap Authors * Copyright 2017-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ var crypto = require('crypto'); diff --git a/js/affix.js b/js/affix.js index ad629048d4..61ed3e8abe 100644 --- a/js/affix.js +++ b/js/affix.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#affix * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/alert.js b/js/alert.js index 7f9606b742..e0a7b0720e 100644 --- a/js/alert.js +++ b/js/alert.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#alerts * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/button.js b/js/button.js index ff4af20e23..5f1dd3bbf0 100644 --- a/js/button.js +++ b/js/button.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#buttons * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/carousel.js b/js/carousel.js index a5fcac3170..c47b2a5660 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#carousel * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/collapse.js b/js/collapse.js index 2cd5997fd5..9dff154223 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#collapse * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ /* jshint latedef: false */ diff --git a/js/dropdown.js b/js/dropdown.js index 4ded850121..a6b6b5f1b7 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#dropdowns * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/modal.js b/js/modal.js index b9eca494fe..e55bc60d24 100644 --- a/js/modal.js +++ b/js/modal.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#modals * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/popover.js b/js/popover.js index 66a301cb8c..3b8c19b20a 100644 --- a/js/popover.js +++ b/js/popover.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#popovers * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/scrollspy.js b/js/scrollspy.js index a629ac6b1c..ee72695148 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#scrollspy * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/tab.js b/js/tab.js index 74495dffcb..588e409d55 100644 --- a/js/tab.js +++ b/js/tab.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#tabs * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/js/tests/README.md b/js/tests/README.md index 9e3d7cccd1..125937358c 100644 --- a/js/tests/README.md +++ b/js/tests/README.md @@ -25,7 +25,7 @@ open `index.html`. * Each test should have a unique name clearly stating what unit is being tested. * Each test should test only one unit per test, although one test can include several assertions. Create multiple tests for multiple units of functionality. * Each test should begin with [`assert.expect`](https://api.qunitjs.com/expect/) to ensure that the expected assertions are run. -* Each test should follow the project's [JavaScript Code Guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#js) +* Each test should follow the project's [JavaScript Code Guidelines](https://github.com/twbs/bootstrap/blob/v3-dev/CONTRIBUTING.md#js) ### Example tests diff --git a/js/tests/index.html b/js/tests/index.html index bb86baa360..4efbdd968b 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -45,7 +45,7 @@ for (var i = 0, len = eventAliases.length; i < len; i++) { var eventAlias = eventAliases[i] $.fn[eventAlias] = function () { - throw new Error('Using the ".' + eventAlias + '()" method is not allowed, so that Bootstrap can be compatible with custom jQuery builds which exclude the "event aliases" module that defines said method. See https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#js') + throw new Error('Using the ".' + eventAlias + '()" method is not allowed, so that Bootstrap can be compatible with custom jQuery builds which exclude the "event aliases" module that defines said method. See https://github.com/twbs/bootstrap/blob/v3-dev/CONTRIBUTING.md#js') } } })() diff --git a/js/tooltip.js b/js/tooltip.js index c8c1c8c2ee..3b7b71b2b2 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -4,7 +4,7 @@ * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ +function ($) { diff --git a/js/transition.js b/js/transition.js index 5a9a3e30f7..81e7122c20 100644 --- a/js/transition.js +++ b/js/transition.js @@ -3,7 +3,7 @@ * https://getbootstrap.com/docs/3.4/javascript/#transitions * ======================================================================== * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) * ======================================================================== */ diff --git a/less/bootstrap.less b/less/bootstrap.less index d6161eb2e5..569899fd58 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,7 +1,7 @@ /*! * Bootstrap v3.4.1 (https://getbootstrap.com/) * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ // Core variables and mixins diff --git a/less/theme.less b/less/theme.less index 8c66f49dd9..0d2db96dcb 100644 --- a/less/theme.less +++ b/less/theme.less @@ -3,7 +3,7 @@ /*! * Bootstrap v3.4.1 (https://getbootstrap.com/) * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE) */ // diff --git a/nuget/bootstrap.less.nuspec b/nuget/bootstrap.less.nuspec index 60292c3979..b7fdca2a26 100644 --- a/nuget/bootstrap.less.nuspec +++ b/nuget/bootstrap.less.nuspec @@ -12,7 +12,7 @@ en-us https://getbootstrap.com/ https://getbootstrap.com/apple-touch-icon.png - https://github.com/twbs/bootstrap/blob/master/LICENSE + https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE Copyright 2019 false diff --git a/nuget/bootstrap.nuspec b/nuget/bootstrap.nuspec index e2a487b769..d535e77656 100644 --- a/nuget/bootstrap.nuspec +++ b/nuget/bootstrap.nuspec @@ -12,7 +12,7 @@ en-us https://getbootstrap.com/ https://getbootstrap.com/apple-touch-icon.png - https://github.com/twbs/bootstrap/blob/master/LICENSE + https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE Copyright 2019 false