diff --git a/.editorconfig b/.editorconfig index ff0ad0433..c193ae071 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,5 +10,8 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true +[*.md] +trim_trailing_whitespace = false + [*.py] indent_size = 4 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..b25f83841 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs. + +See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. + +Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release. diff --git a/Gruntfile.js b/Gruntfile.js index df7dfe45a..8e9707b24 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -258,6 +258,7 @@ module.exports = function (grunt) { // and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly compatibility: 'ie8', keepSpecialComments: '*', + sourceMap: true, noAdvanced: true }, core: { diff --git a/README.md b/README.md index 8864865c8..c38050608 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,8 @@ bootstrap/ ├── css/ │ ├── bootstrap.css │ ├── bootstrap.css.map -│ └── bootstrap.min.css +│ ├── bootstrap.min.css +│ └── bootstrap.min.css.map └── js/ ├── bootstrap.js └── bootstrap.min.js diff --git a/bower.json b/bower.json index 795aa445a..0d24a6392 100644 --- a/bower.json +++ b/bower.json @@ -29,6 +29,6 @@ "test-infra" ], "dependencies": { - "jquery": ">= 1.9.1" + "jquery": "1.9.1 - 2" } } diff --git a/dist/css/bootstrap-theme.min.css.map b/dist/css/bootstrap-theme.min.css.map new file mode 100644 index 000000000..2c6b65afc Binary files /dev/null and b/dist/css/bootstrap-theme.min.css.map differ diff --git a/dist/css/bootstrap.min.css.map b/dist/css/bootstrap.min.css.map new file mode 100644 index 000000000..1510ad0f2 Binary files /dev/null and b/dist/css/bootstrap.min.css.map differ diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml index 63f7b3248..a53bc6789 100644 --- a/docs/_data/browser-bugs.yml +++ b/docs/_data/browser-bugs.yml @@ -1,6 +1,6 @@ - browser: > - Internet Explorer 11 + Internet Explorer 11 & Microsoft Edge summary: > Hovered element still remains in `:hover` state after scrolling away. upstream_bug: > @@ -10,7 +10,7 @@ - browser: > - Internet Explorer 11 + Internet Explorer 11 & Microsoft Edge summary: > When hovering over a `` with `display: block` - upstream_bug: > - WebKit#141804, Safari#19892433 - origin: > - Bootstrap#15832 - - browser: > Safari (OS X) summary: > Focus ring of image map within a modal is displayed in the wrong location. upstream_bug: > - WebKit#143527 + WebKit#143527, Safari#21908735 origin: > Bootstrap#16180 -- - browser: > - Safari (OS X) - summary: > - Unnecessary line-wrapping of `.navbar-brand` text for no apparent reason - upstream_bug: > - WebKit#144990, Safari#20950962 - origin: > - Bootstrap#15998 - - browser: > Safari (iOS) @@ -279,3 +259,13 @@ WebKit#139848, Safari#19434878 origin: > Bootstrap#11266, Bootstrap#13098 + +- + browser: > + Safari (iOS) + summary: > + Tapping below ``s can focus them in some cases + upstream_bug: > + WebKit#146244, Safari#21509310 + origin: > + Bootstrap#15968 diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index b073a6631..dc8717dd8 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -28,6 +28,11 @@ description: Bootstrap 한국어 url: http://bootstrapk.com/ +- name: Brazilian Portuguese + code: pt-BR + description: Bootstrap em Português do Brasil + url: http://bootstrapbrasil.github.io/ + - name: Russian code: ru description: Bootstrap по-русски @@ -38,6 +43,11 @@ description: Bootstrap en Español url: http://www.oneskyapp.com/es/docs/bootstrap/ +- name: Turkish + code: tr + description: Türkçe Bootstrap + url: http://www.trbootstrap.com + - name: Ukrainian code: uk description: Bootstrap українською diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index f1b8db66a..0a2a26004 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -1,41 +1,19 @@ - - - + {% if site.github %} @@ -71,23 +49,6 @@ Holder.addTheme('gray', { }) -{% comment %} - Inject Twitter widgets asynchronously. Snippet snipped from Twitter's - JS interface site: https://dev.twitter.com/docs/tfw-javascript - - * "js.async=1;" added to add async attribute to the generated script tag. -{% endcomment %} - - - + diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index cb87c16e7..54b28186e 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -178,6 +178,7 @@ ================================================== --> + diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index e71f62768..e7c7539a9 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/index.html @@ -64,6 +64,7 @@ ================================================== --> + diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 63cd79a19..68e8a3dd8 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -75,22 +75,22 @@
- Generic placeholder thumbnail + Generic placeholder thumbnail

Label

Something else
- Generic placeholder thumbnail + Generic placeholder thumbnail

Label

Something else
- Generic placeholder thumbnail + Generic placeholder thumbnail

Label

Something else
- Generic placeholder thumbnail + Generic placeholder thumbnail

Label

Something else
@@ -232,6 +232,7 @@ ================================================== --> + diff --git a/docs/examples/index.md b/docs/examples/index.md index 233b2430b..f18365c80 100644 --- a/docs/examples/index.md +++ b/docs/examples/index.md @@ -5,6 +5,8 @@ title: Examples Quickly get a project started with any of our examples ranging from using parts of the framework to custom components and layouts. +[Download the Bootstrap source code]({{ site.download.source }}) to snag these examples. + ## Framework Examples that focus on implementing uses of built-in components provided by Bootstrap. diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index 4326dc3d7..efc545bbc 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -79,6 +79,7 @@ ================================================== --> + diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index 857e6a4f0..a7ddcd808 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -53,6 +53,7 @@ ================================================== --> + diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 9c2ac8cdc..5e963d0be 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -118,7 +118,10 @@ ================================================== --> + + + diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index 14a38cdee..84b3bdec6 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -52,6 +52,7 @@ ================================================== --> + diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 544585610..617626522 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -77,6 +77,7 @@ ================================================== --> + diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html index c47769bf1..e5773948c 100644 --- a/docs/examples/tooltip-viewport/index.html +++ b/docs/examples/tooltip-viewport/index.html @@ -43,7 +43,10 @@ ================================================== --> + + + diff --git a/docs/getting-started/contents.md b/docs/getting-started/contents.md index 8377bf32e..7df3d8965 100644 --- a/docs/getting-started/contents.md +++ b/docs/getting-started/contents.md @@ -28,6 +28,7 @@ bootstrap/ │ ├── bootstrap.css │ ├── bootstrap.css.map │ ├── bootstrap.min.css +│ └── bootstrap.min.css.map └── js/ ├── bootstrap.js └── bootstrap.min.js diff --git a/docs/index.html b/docs/index.html index 514eb78c7..dadad0876 100644 --- a/docs/index.html +++ b/docs/index.html @@ -102,7 +102,7 @@ $ composer require twbs/bootstrap {% for showcase in site.data.showcase %}
- {{ showcase.name }} + {{ showcase.name }}
{% endfor %} diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 2c245244a..633f76edf 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -28,8 +28,8 @@ "+function ($) {", " 'use strict';", " var version = $.fn.jquery.split(' ')[0].split('.')", - " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')", + " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {", + " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')", " }", "}(jQuery);\n\n" ] diff --git a/js/tests/index.html b/js/tests/index.html index 0e2bdd012..a91725cc5 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -55,7 +55,7 @@