From e105d156420864807dca97d4953d0baf843f01f9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 18 Sep 2018 22:27:46 +0300 Subject: [PATCH] Use https, fix broken links and unneeded redirects. --- CHANGELOG.md | 4 +- CONTRIBUTING.md | 16 +++---- Gruntfile.js | 2 +- ISSUE_TEMPLATE.md | 4 +- README.md | 40 +++++++++--------- _config.yml | 8 ++-- bower.json | 2 +- composer.json | 2 +- docs/_data/browser-features.yml | 4 +- docs/_data/showcase.yml | 11 ++--- docs/_data/translations.yml | 13 ++---- docs/_includes/ads.html | 2 +- docs/_includes/components/glyphicons.html | 4 +- docs/_includes/components/progress-bars.html | 2 +- .../components/responsive-embed.html | 2 +- docs/_includes/components/thumbnails.html | 2 +- docs/_includes/css/forms.html | 4 +- docs/_includes/css/less.html | 2 +- docs/_includes/css/overview.html | 2 +- docs/_includes/footer.html | 4 +- .../getting-started/accessibility.html | 14 +++--- .../browser-device-support.html | 12 +++--- docs/_includes/getting-started/community.html | 6 +-- docs/_includes/getting-started/download.html | 10 ++--- docs/_includes/getting-started/grunt.html | 6 +-- docs/_includes/getting-started/tools.html | 2 +- .../getting-started/whats-included.html | 4 +- docs/_includes/header.html | 2 +- docs/_includes/js/dropdowns.html | 2 +- docs/_includes/js/modal.html | 4 +- docs/_includes/js/overview.html | 2 +- docs/_includes/js/popovers.html | 2 +- docs/_includes/js/scrollspy.html | 2 +- docs/_includes/nav/main.html | 8 ++-- docs/_includes/v4.html | 2 +- docs/_plugins/bugify.rb | 2 +- docs/about.html | 6 +-- docs/assets/img/expo-riot.jpg | Bin 161715 -> 0 bytes .../assets/js/ie10-viewport-bug-workaround.js | 2 +- docs/assets/js/src/application.js | 2 +- docs/assets/js/src/customizer.js | 2 +- docs/assets/less/docs.less | 2 +- docs/assets/less/featured-sites.less | 6 +-- .../less/ie10-viewport-bug-workaround.less | 2 +- docs/browser-bugs.html | 2 +- docs/customize.html | 4 +- docs/examples/blog/index.html | 2 +- docs/examples/cover/index.html | 2 +- docs/examples/grid/index.html | 2 +- docs/examples/non-responsive/index.html | 2 +- docs/examples/sticky-footer-navbar/index.html | 2 +- docs/examples/sticky-footer/index.html | 2 +- docs/index.html | 12 +++--- docs/migration.html | 4 +- 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 +- 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 | 6 +-- js/tests/visual/carousel.html | 6 +-- js/tooltip.js | 2 +- js/transition.js | 6 +-- less/bootstrap.less | 2 +- less/responsive-utilities.less | 6 +-- less/scaffolding.less | 6 +-- less/theme.less | 2 +- nuget/bootstrap.less.nuspec | 6 +-- nuget/bootstrap.nuspec | 6 +-- package.js | 2 +- package.json | 2 +- 80 files changed, 168 insertions(+), 178 deletions(-) delete mode 100644 docs/assets/img/expo-riot.jpg diff --git a/CHANGELOG.md b/CHANGELOG.md index b25f838413..416b64bdb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs. +Bootstrap uses [GitHub's Releases feature](https://blog.github.com/2013-07-02-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. +Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com/) contain summaries of the most noteworthy changes made in each release. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13be35f1e6..77023e9c28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,14 +25,14 @@ restrictions: respect the opinions of others. * Please **do not** post comments consisting solely of "+1" or ":thumbsup:". - Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) + Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) instead. We reserve the right to delete comments which violate this rule. * Please **do not** open issues or pull requests regarding the code in [`Normalize`](https://github.com/necolas/normalize.css) (open them in their respective repositories). -* Please **do not** open issues regarding the official themes offered on . +* Please **do not** open issues regarding the official themes offered on . Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`. @@ -62,7 +62,7 @@ Good bug reports are extremely helpful, so thanks! Guidelines for bug reports: -0. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu) +0. **Validate and lint your code** — [validate your HTML](https://html5.validator.nu/) and [lint your HTML](https://github.com/twbs/bootlint) to ensure your problem isn't caused by a simple error in your own code. @@ -105,7 +105,7 @@ Example: ### Reporting upstream browser bugs Sometimes bugs reported to us are actually caused by bugs in the browser(s) themselves, not bugs in Bootstrap per se. -When feasible, we aim to report such upstream bugs to the relevant browser vendor(s), and then list them on our [Wall of Browser Bugs](http://getbootstrap.com/browser-bugs/) and [document them in MDN](https://developer.mozilla.org/en-US/docs/Web). +When feasible, we aim to report such upstream bugs to the relevant browser vendor(s), and then list them on our [Wall of Browser Bugs](https://getbootstrap.com/docs/3.4/browser-bugs/) and [document them in MDN](https://developer.mozilla.org/en-US/docs/Web). | Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes | | ------------- | ---------------------------- | ---------------- | ------------------------------------------------------------------------------------- | -------------------------------------------------------- | @@ -199,7 +199,7 @@ included in the project: 4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) or your code is unlikely to be merged into the main project. Use Git's - [interactive rebase](https://help.github.com/articles/interactive-rebase) + [interactive rebase](https://help.github.com/articles/about-git-rebase/) feature to tidy up your commits before making them public. 5. Locally merge (or rebase) the upstream development branch into your topic branch: @@ -247,8 +247,8 @@ includes code changes) and under the terms of the [Adhere to the Code Guide.](http://codeguide.co/#css) -- When feasible, default color palettes should comply with [WCAG color contrast guidelines](http://www.w3.org/TR/WCAG20/#visual-audio-contrast). -- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines) for more details. +- When feasible, default color palettes should comply with [WCAG color contrast guidelines](https://www.w3.org/TR/WCAG20/#visual-audio-contrast). +- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](https://a11yproject.com/posts/never-remove-css-outlines/) for more details. ### JS @@ -256,7 +256,7 @@ includes code changes) and under the terms of the - 2 spaces (no tabs) - strict mode - "Attractive" -- Don't use [jQuery event alias convenience methods](https://github.com/jquery/jquery/blob/master/src/event/alias.js) (such as `$().focus()`). Instead, use [`$().trigger(eventType, ...)`](http://api.jquery.com/trigger/) or [`$().on(eventType, ...)`](http://api.jquery.com/on/), depending on whether you're firing an event or listening for an event. (For example, `$().trigger('focus')` or `$().on('focus', function (event) { /* handle focus event */ })`) We do this to be compatible with custom builds of jQuery where the event aliases module has been excluded. +- Don't use [jQuery event alias convenience methods](https://github.com/jquery/jquery/blob/master/src/event/alias.js) (such as `$().focus()`). Instead, use [`$().trigger(eventType, ...)`](https://api.jquery.com/trigger/) or [`$().on(eventType, ...)`](https://api.jquery.com/on/), depending on whether you're firing an event or listening for an event. (For example, `$().trigger('focus')` or `$().on('focus', function (event) { /* handle focus event */ })`) We do this to be compatible with custom builds of jQuery where the event aliases module has been excluded. ### Checking coding style diff --git a/Gruntfile.js b/Gruntfile.js index 4a69113eb0..aae26613f4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,6 @@ /*! * Bootstrap's Gruntfile - * http://getbootstrap.com + * https://getbootstrap.com/ * Copyright 2013-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 66c3a2bb21..d7732a7927 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,7 +1,7 @@ Before opening an issue: - [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) -- [Validate](http://validator.w3.org/nu/) and [lint](https://github.com/twbs/bootlint#in-the-browser) any HTML to avoid common problems +- [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) @@ -14,7 +14,7 @@ When reporting a bug, include: - Operating system and version (Windows, Mac OS X, Android, iOS, Win10 Mobile) - Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser) -- Reduced test cases and potential fixes using [JS Bin](https://jsbin.com) +- Reduced test cases and potential fixes using [JS Bin](https://jsbin.com/) When suggesting a feature, include: diff --git a/README.md b/README.md index 9e19d562c5..e540707a26 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# [Bootstrap](http://getbootstrap.com) +# [Bootstrap](https://getbootstrap.com/) -[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com) +[![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) @@ -10,7 +10,7 @@ Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community. -To get started, check out ! +To get started, check out ! ## Table of contents @@ -32,12 +32,12 @@ Several quick start options are available: * [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.4.0.zip). * Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. -* Install with [Bower](http://bower.io): `bower install bootstrap`. -* Install with [npm](https://www.npmjs.com): `npm install bootstrap@3`. -* Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`. -* Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`. +* Install with [Bower](https://bower.io/): `bower install bootstrap`. +* Install with [npm](https://www.npmjs.com/): `npm install bootstrap@3`. +* Install with [Meteor](https://www.meteor.com/): `meteor add twbs:bootstrap`. +* Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap`. -Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. +Read the [Getting started page](https://getbootstrap.com/docs/3.4/getting-started/) for information on the framework contents, templates and examples, and more. ### What's included @@ -65,7 +65,7 @@ bootstrap/ └── glyphicons-halflings-regular.woff2 ``` -We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme. +We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme. ## Bugs and feature requests @@ -77,20 +77,20 @@ Note that **feature requests must target [Bootstrap v4](https://github.com/twbs/ ## Documentation -Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at . The docs may also be run locally. +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. ### Running documentation locally -1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) and other Ruby dependencies with `bundle install`. - **Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. +1. If necessary, [install Jekyll](https://jekyllrb.com/docs/installation/) and other Ruby dependencies with `bundle install`. + **Note for Windows users:** Read [this guide](https://jekyllrb.com/docs/installation/windows/) to get Jekyll up and running without problems. 2. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line. 4. Open `http://localhost:9001` in your browser, and voilà. -Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). +Learn more about using Jekyll by reading its [documentation](https://jekyllrb.com/docs/). ### Documentation for previous releases -Documentation for v2.3.2 has been made available for the time being at while folks transition to Bootstrap 3. +Documentation for v2.3.2 has been made available for the time being at while folks transition to Bootstrap 3. [Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download. @@ -103,7 +103,7 @@ Moreover, if your pull request contains JavaScript patches or features, you must **Bootstrap v3 is now closed off to new features.** It has gone into maintenance mode so that we can focus our efforts on [Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev), the future of the framework. Pull requests which add new features (rather than fix bugs) should target [Bootstrap v4 (the `v4-dev` git branch)](https://github.com/twbs/bootstrap/tree/v4-dev) instead. -Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at . +Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at . ## Community @@ -111,18 +111,18 @@ Editor preferences are available in the [editor config](https://github.com/twbs/ Get updates on Bootstrap's development and chat with the project maintainers and community members. * Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). -* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). -* Join [the official Slack room](https://bootstrap-slack.herokuapp.com). +* Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/). +* Join [the official Slack room](https://bootstrap-slack.herokuapp.com/). * Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. * Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). -* Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. +* Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/search?q=keywords:bootstrap) or similar delivery mechanisms for maximum discoverability. ## Versioning -For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible. +For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](https://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible. -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. +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](https://blog.getbootstrap.com/) contain summaries of the most noteworthy changes made in each release. ## Thanks diff --git a/_config.yml b/_config.yml index 29f9f87cca..30b698265b 100644 --- a/_config.yml +++ b/_config.yml @@ -10,7 +10,7 @@ source: docs destination: _gh_pages host: 0.0.0.0 port: 9001 -url: http://getbootstrap.com +url: https://getbootstrap.com baseurl: /docs/3.4 encoding: UTF-8 @@ -28,9 +28,9 @@ download: dist: https://github.com/twbs/bootstrap/releases/download/v3.4.0/bootstrap-3.4.0-dist.zip sass: https://github.com/twbs/bootstrap-sass/archive/v3.4.0.tar.gz -blog: http://blog.getbootstrap.com -expo: http://expo.getbootstrap.com -themes: http://themes.getbootstrap.com +blog: https://blog.getbootstrap.com +expo: https://expo.getbootstrap.com +themes: https://themes.getbootstrap.com cdn: # See https://www.srihash.org for info on how to generate the hashes diff --git a/bower.json b/bower.json index b1b1bc0da5..379d65f4a7 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,7 @@ "framework", "web" ], - "homepage": "http://getbootstrap.com", + "homepage": "https://getbootstrap.com/", "license": "MIT", "moduleType": "globals", "main": [ diff --git a/composer.json b/composer.json index 10aae6a6e5..f555a043cd 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "framework", "web" ], - "homepage": "http://getbootstrap.com", + "homepage": "https://getbootstrap.com/", "authors": [ { "name": "Mark Otto", diff --git a/docs/_data/browser-features.yml b/docs/_data/browser-features.yml index bac9a40b7c..5a19a4dd16 100644 --- a/docs/_data/browser-features.yml +++ b/docs/_data/browser-features.yml @@ -42,7 +42,7 @@ browser: > Firefox summary: > - Implement the [`of ` clause](http://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class + Implement the [`of ` clause](https://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class upstream_bug: > Mozilla#854148 origin: > @@ -62,7 +62,7 @@ browser: > Chrome summary: > - Implement the [`of ` clause](http://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class + Implement the [`of ` clause](https://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class upstream_bug: > Chromium#304163 origin: > diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml index 45e9b0ccc0..adbb69f403 100644 --- a/docs/_data/showcase.yml +++ b/docs/_data/showcase.yml @@ -1,19 +1,14 @@ - name: Lyft url: https://www.lyft.com - expo_url: http://expo.getbootstrap.com/2014/10/29/lyft/ + expo_url: https://expo.getbootstrap.com/2014/10/29/lyft/ img: lyft - name: Vogue url: http://www.vogue.com - expo_url: http://expo.getbootstrap.com/2014/09/30/vogue/ + expo_url: https://expo.getbootstrap.com/2014/09/30/vogue/ img: vogue -- name: Riot Design - url: http://riotdesign.eu/en/ - expo_url: http://expo.getbootstrap.com/2014/03/13/riot-design/ - img: riot - - name: Newsweek url: http://www.newsweek.com/ - expo_url: http://expo.getbootstrap.com/2014/02/12/newsweek/ + expo_url: https://expo.getbootstrap.com/2014/02/12/newsweek/ img: newsweek diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index 4579556f01..21357e3645 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -1,13 +1,8 @@ - name: Chinese code: zh description: Bootstrap 中文文档 - url: http://v3.bootcss.com/ + url: https://v3.bootcss.com/ -- name: Chinese (Traditional) - code: zh-TW - description: Bootstrap 3 中文手冊 - url: https://kkbruce.tw/bs3/ - - name: Danish code: da description: Bootstrap pÃ¥ Dansk @@ -26,7 +21,7 @@ - name: Italian code: it description: Bootstrap in Italiano - url: http://www.hackerstribe.com/guide/IT-bootstrap-3.1.1/ + url: https://www.hackerstribe.com/guide/IT-bootstrap-3.1.1/ - name: Korean code: ko @@ -36,7 +31,7 @@ - name: Brazilian Portuguese code: pt-BR description: Bootstrap em Português do Brasil - url: http://bootstrapbrasil.github.io/ + url: https://getbootstrap.com.br/ - name: Russian code: ru @@ -56,7 +51,7 @@ - name: Ukrainian code: uk description: Bootstrap українською - url: http://twbs.docs.org.ua + url: https://twbs.docs.org.ua/ - name: Vietnamese code: vi diff --git a/docs/_includes/ads.html b/docs/_includes/ads.html index f379558b73..10df1344d7 100644 --- a/docs/_includes/ads.html +++ b/docs/_includes/ads.html @@ -1 +1 @@ - + diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index 1653863bc3..c5c0fc67d5 100644 --- a/docs/_includes/components/glyphicons.html +++ b/docs/_includes/components/glyphicons.html @@ -2,7 +2,7 @@

Glyphicons

Available glyphs

-

Includes over 250 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to Glyphicons whenever possible.

+

Includes over 250 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to Glyphicons whenever possible.

    {% for iconClassName in site.data.glyphicons %} @@ -30,7 +30,7 @@

    Bootstrap assumes icon font files will be located in the ../fonts/ directory, relative to the compiled CSS files. Moving or renaming those font files means updating the CSS in one of three ways:

    • Change the @icon-font-path and/or @icon-font-name variables in the source Less files.
    • -
    • Utilize the relative URLs option provided by the Less compiler.
    • +
    • Utilize the relative URLs option provided by the Less compiler.
    • Change the url() paths in the compiled CSS.

    Use whatever option best suits your specific development setup.

    diff --git a/docs/_includes/components/progress-bars.html b/docs/_includes/components/progress-bars.html index f349810a8d..26886e228b 100644 --- a/docs/_includes/components/progress-bars.html +++ b/docs/_includes/components/progress-bars.html @@ -10,7 +10,7 @@

    Content Security Policy (CSP) compatibility

    -

    If your website has a Content Security Policy (CSP) which doesn't allow style-src 'unsafe-inline', then you won't be able to use inline style attributes to set progress bar widths as shown in our examples below. Alternative methods for setting the widths that are compatible with strict CSPs include using a little custom JavaScript (that sets element.style.width) or using custom CSS classes.

    +

    If your website has a Content Security Policy (CSP) which doesn't allow style-src 'unsafe-inline', then you won't be able to use inline style attributes to set progress bar widths as shown in our examples below. Alternative methods for setting the widths that are compatible with strict CSPs include using a little custom JavaScript (that sets element.style.width) or using custom CSS classes.

    Basic example

    diff --git a/docs/_includes/components/responsive-embed.html b/docs/_includes/components/responsive-embed.html index bb79053ca2..a13b1dc01c 100644 --- a/docs/_includes/components/responsive-embed.html +++ b/docs/_includes/components/responsive-embed.html @@ -6,7 +6,7 @@

    Pro-Tip! You don't need to include frameborder="0" in your <iframe>s as we override that for you.

    - +
    {% highlight html %} diff --git a/docs/_includes/components/thumbnails.html b/docs/_includes/components/thumbnails.html index 8b2d6f939c..182f516427 100644 --- a/docs/_includes/components/thumbnails.html +++ b/docs/_includes/components/thumbnails.html @@ -2,7 +2,7 @@

    Thumbnails

    Extend Bootstrap's grid system with the thumbnail component to easily display grids of images, videos, text, and more.

    -

    If you're looking for Pinterest-like presentation of thumbnails of varying heights and/or widths, you'll need to use a third-party plugin such as Masonry, Isotope, or Salvattore.

    +

    If you're looking for Pinterest-like presentation of thumbnails of varying heights and/or widths, you'll need to use a third-party plugin such as Masonry, Isotope, or Salvattore.

    Default example

    By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

    diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 7aac785b8c..fb6e31b0c7 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -51,7 +51,7 @@ {% endhighlight %}

    Don't mix form groups with input groups

    -

    Do not mix form groups directly with input groups. Instead, nest the input group inside of the form group.

    +

    Do not mix form groups directly with input groups. Instead, nest the input group inside of the form group.

    @@ -728,7 +728,7 @@

    Feedback icons only work with textual <input class="form-control"> elements.

    Icons, labels, and input groups

    -

    Manual positioning of feedback icons is required for inputs without a label and for input groups with an add-on on the right. You are strongly encouraged to provide labels for all inputs for accessibility reasons. If you wish to prevent labels from being displayed, hide them with the .sr-only class. If you must do without labels, adjust the top value of the feedback icon. For input groups, adjust the right value to an appropriate pixel value depending on the width of your addon.

    +

    Manual positioning of feedback icons is required for inputs without a label and for input groups with an add-on on the right. You are strongly encouraged to provide labels for all inputs for accessibility reasons. If you wish to prevent labels from being displayed, hide them with the .sr-only class. If you must do without labels, adjust the top value of the feedback icon. For input groups, adjust the right value to an appropriate pixel value depending on the width of your addon.

    Conveying the icon's meaning to assistive technologies

    diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html index 85787303b4..03caf113fb 100644 --- a/docs/_includes/css/less.html +++ b/docs/_includes/css/less.html @@ -161,7 +161,7 @@ a {

    Box-sizing

    -

    Reset your components' box model with a single mixin. For context, see this helpful article from Mozilla.

    +

    Reset your components' box model with a single mixin. For context, see this helpful article from Mozilla.

    The mixin is deprecated as of v3.2.0, with the introduction of Autoprefixer. To preserve backwards-compatibility, Bootstrap will continue to use the mixin internally until Bootstrap v4.

    {% highlight scss %} .box-sizing(@box-model) { diff --git a/docs/_includes/css/overview.html b/docs/_includes/css/overview.html index bd0e538483..028c747e8f 100644 --- a/docs/_includes/css/overview.html +++ b/docs/_includes/css/overview.html @@ -33,7 +33,7 @@

    These styles can be found within scaffolding.less.

    Normalize.css

    -

    For improved cross-browser rendering, we use Normalize.css, a project by Nicolas Gallagher and Jonathan Neal.

    +

    For improved cross-browser rendering, we use Normalize.css, a project by Nicolas Gallagher and Jonathan Neal.

    Containers

    Bootstrap requires a containing element to wrap site contents and house our grid system. You may choose one of two containers to use in your projects. Note that, due to padding and more, neither container is nestable.

    diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 212845108e..23ec28123d 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -6,8 +6,8 @@

    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.

    diff --git a/docs/_includes/getting-started/accessibility.html b/docs/_includes/getting-started/accessibility.html index 60820c1211..5910a1b9f7 100644 --- a/docs/_includes/getting-started/accessibility.html +++ b/docs/_includes/getting-started/accessibility.html @@ -3,9 +3,9 @@

    Bootstrap follows common web standards and—with minimal extra effort—can be used to create sites that are accessible to those using AT.

    Skip navigation

    -

    If your navigation contains many links and comes before the main content in the DOM, add a Skip to main content link before the navigation (for a simple explanation, see this A11Y Project article on skip navigation links). Using the .sr-only class will visually hide the skip link, and the .sr-only-focusable class will ensure that the link becomes visible once focused (for sighted keyboard users).

    +

    If your navigation contains many links and comes before the main content in the DOM, add a Skip to main content link before the navigation (for a simple explanation, see this A11Y Project article on skip navigation links). Using the .sr-only class will visually hide the skip link, and the .sr-only-focusable class will ensure that the link becomes visible once focused (for sighted keyboard users).

    @@ -21,17 +21,17 @@

    Nested headings

    When nesting headings (<h1> - <h6>), your primary document header should be an <h1>. Subsequent headings should make logical use of <h2> - <h6> such that screen readers can construct a table of contents for your pages.

    -

    Learn more at HTML CodeSniffer and Penn State's AccessAbility.

    +

    Learn more at HTML CodeSniffer and Penn State's AccessAbility.

    Color contrast

    -

    Currently, some of the default color combinations available in Bootstrap (such as the various styled button classes, some of the code highlighting colors used for basic code blocks, the .bg-primary contextual background helper class, and the default link color when used on a white background) have a low contrast ratio (below the recommended ratio of 4.5:1). This can cause problems to users with low vision or who are color blind. These default colors may need to be modified to increase their contrast and legibility.

    +

    Currently, some of the default color combinations available in Bootstrap (such as the various styled button classes, some of the code highlighting colors used for basic code blocks, the .bg-primary contextual background helper class, and the default link color when used on a white background) have a low contrast ratio (below the recommended ratio of 4.5:1). This can cause problems to users with low vision or who are color blind. These default colors may need to be modified to increase their contrast and legibility.

    Additional resources

    diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html index a0a12115f1..758530f769 100644 --- a/docs/_includes/getting-started/browser-device-support.html +++ b/docs/_includes/getting-started/browser-device-support.html @@ -75,7 +75,7 @@

    On Windows, we support Internet Explorer 8-11.

    -

    For Firefox, in addition to the latest normal stable release, we also support the latest Extended Support Release (ESR) version of Firefox.

    +

    For Firefox, in addition to the latest normal stable release, we also support the latest Extended Support Release (ESR) version of Firefox.

    Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 7, as well as Microsoft Edge, though they are not officially supported.

    For a list of some of the browser bugs that Bootstrap has to grapple with, see our Wall of browser bugs.

    @@ -119,7 +119,7 @@
-

Visit Can I use... for details on browser support of CSS3 and HTML5 features.

+

Visit Can I use... for details on browser support of CSS3 and HTML5 features.

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.

@@ -143,14 +143,14 @@ {% endhighlight %}

Confirm the document mode by opening the debugging tools: press F12 and check the "Document Mode".

This tag is included in all of Bootstrap's documentation and examples to ensure the best rendering possible in each supported version of Internet Explorer.

-

See this StackOverflow question for more information.

+

See this StackOverflow question for more information.

Internet Explorer 10 in Windows 8 and Windows Phone 8

Internet Explorer 10 doesn't differentiate device width from viewport width, and thus doesn't properly apply the media queries in Bootstrap's CSS. Normally you'd just add a quick snippet of CSS to fix this:

{% highlight scss %} @-ms-viewport { width: device-width; } {% endhighlight %} -

However, this doesn't work for devices running Windows Phone 8 versions older than Update 3 (a.k.a. GDR3), as it causes such devices to show a mostly desktop view instead of narrow "phone" view. To address this, you'll need to include the following CSS and JavaScript to work around the bug.

+

However, this doesn't work for devices running Windows Phone 8 versions older than Update 3 (a.k.a. GDR3), as it causes such devices to show a mostly desktop view instead of narrow "phone" view. To address this, you'll need to include the following CSS and JavaScript to work around the bug.

{% highlight scss %} @-ms-viewport { width: device-width; } @-o-viewport { width: device-width; } @@ -170,7 +170,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { document.querySelector('head').appendChild(msViewportStyle) } {% endhighlight %} -

For more information and usage guidelines, read Windows Phone 8 and Device-Width.

+

For more information and usage guidelines, read Windows Phone 8 and Device-Width.

As a heads up, we include this in all of Bootstrap's documentation and examples as a demonstration.

Safari percent rounding

@@ -228,7 +228,7 @@ $(function () { }) {% endhighlight %} -

Want to see an example? Check out this JS Bin demo.

+

Want to see an example? Check out this JS Bin demo.

Validators

In order to provide the best possible experience to old and buggy browsers, Bootstrap uses CSS browser hacks in several places to target special CSS to certain browser versions in order to work around bugs in the browsers themselves. These hacks understandably cause CSS validators to complain that they are invalid. In a couple places, we also use bleeding-edge CSS features that aren't yet fully standardized, but these are used purely for progressive enhancement.

diff --git a/docs/_includes/getting-started/community.html b/docs/_includes/getting-started/community.html index 73a88f8076..c832e948ca 100644 --- a/docs/_includes/getting-started/community.html +++ b/docs/_includes/getting-started/community.html @@ -3,11 +3,11 @@

Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.

    -
  • Read and subscribe to The Official Bootstrap Blog.
  • +
  • Read and subscribe to The Official Bootstrap Blog.
  • Chat with fellow Bootstrappers using IRC in the irc.freenode.net server, in the ##bootstrap channel.
  • For help using Bootstrap, ask on StackOverflow using the tag twitter-bootstrap-3.
  • -
  • Developers should use the keyword bootstrap on packages which modify or add to the functionality of Bootstrap when distributing through npm or similar delivery mechanisms for maximum discoverability.
  • -
  • Find inspiring examples of people building with Bootstrap at the Bootstrap Expo.
  • +
  • Developers should use the keyword bootstrap on packages which modify or add to the functionality of Bootstrap when distributing through npm or similar delivery mechanisms for maximum discoverability.
  • +
  • Find inspiring examples of people building with Bootstrap at the Bootstrap Expo.

You can also follow @getbootstrap on Twitter for the latest gossip and awesome music videos.

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index 08ddfe7d49..06426c60e2 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -41,23 +41,23 @@ {% endhighlight %}

Install with Bower

-

You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using Bower:

+

You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using Bower:

{% highlight bash %}bower install bootstrap{% endhighlight %}

Install with npm

-

You can also install Bootstrap using npm:

+

You can also install Bootstrap using npm:

{% highlight bash %}npm install bootstrap@3{% endhighlight %}

require('bootstrap') will load all of Bootstrap's jQuery plugins onto the jQuery object. The bootstrap module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the /js/*.js files under the package's top-level directory.

Bootstrap's package.json contains some additional metadata under the following keys:

    -
  • less - path to Bootstrap's main Less source file
  • +
  • less - path to Bootstrap's main Less source file
  • style - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)

Install with Composer

-

You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using Composer:

+

You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using Composer:

{% highlight bash %}composer require twbs/bootstrap{% endhighlight %}

Autoprefixer required for Less/Sass

-

Bootstrap uses Autoprefixer to deal with CSS vendor prefixes. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.

+

Bootstrap uses Autoprefixer to deal with CSS vendor prefixes. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.

diff --git a/docs/_includes/getting-started/grunt.html b/docs/_includes/getting-started/grunt.html index fc71f28817..09438715f7 100644 --- a/docs/_includes/getting-started/grunt.html +++ b/docs/_includes/getting-started/grunt.html @@ -1,7 +1,7 @@

Compiling CSS and JavaScript

-

Bootstrap uses Grunt for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more.

+

Bootstrap uses Grunt for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more.

Installing Grunt

To install Grunt, you must first download and install node.js (which includes npm). npm stands for node packaged modules and is a way to manage development dependencies through node.js.

@@ -22,13 +22,13 @@

Watches the Less source files and automatically recompiles them to CSS whenever you save a change.

grunt test (Run tests)

-

Runs JSHint and runs the QUnit tests in real browsers thanks to Karma.

+

Runs JSHint and runs the QUnit tests in real browsers thanks to Karma.

grunt docs (Build & test the docs assets)

Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via bundle exec jekyll serve.

grunt (Build absolutely everything and run tests)

-

Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Requires Jekyll. Usually only necessary if you're hacking on Bootstrap itself.

+

Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Requires Jekyll. Usually only necessary if you're hacking on Bootstrap itself.

Troubleshooting

Should you encounter problems with installing dependencies or running Grunt commands, first delete the /node_modules/ directory generated by npm. Then, rerun npm install.

diff --git a/docs/_includes/getting-started/tools.html b/docs/_includes/getting-started/tools.html index 2a38643fa8..826fe80fc9 100644 --- a/docs/_includes/getting-started/tools.html +++ b/docs/_includes/getting-started/tools.html @@ -2,5 +2,5 @@

Tools

Bootlint

-

Bootlint is the official Bootstrap HTML linter tool. It automatically checks for several common HTML mistakes in webpages that are using Bootstrap in a fairly "vanilla" way. Vanilla Bootstrap's components/widgets require their parts of the DOM to conform to certain structures. Bootlint checks that instances of Bootstrap components have correctly-structured HTML. Consider adding Bootlint to your Bootstrap web development toolchain so that none of the common mistakes slow down your project's development.

+

Bootlint is the official Bootstrap HTML linter tool. It automatically checks for several common HTML mistakes in webpages that are using Bootstrap in a fairly "vanilla" way. Vanilla Bootstrap's components/widgets require their parts of the DOM to conform to certain structures. Bootlint checks that instances of Bootstrap components have correctly-structured HTML. Consider adding Bootlint to your Bootstrap web development toolchain so that none of the common mistakes slow down your project's development.

diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html index 3d48efa2d3..a82c11889c 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

@@ -35,7 +35,7 @@ bootstrap/ {% endhighlight %} -

This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). CSS source maps (bootstrap.*.map) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.

+

This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). CSS source maps (bootstrap.*.map) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.

Bootstrap source code

The Bootstrap source code download includes the precompiled CSS, JavaScript, and font assets, along with source Less, JavaScript, and documentation. More specifically, it includes the following and more:

diff --git a/docs/_includes/header.html b/docs/_includes/header.html index d7077f9a09..f63e9e3f3c 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -55,7 +55,7 @@ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-146052-10', 'getbootstrap.com'); ga('send', 'pageview'); diff --git a/docs/_includes/js/dropdowns.html b/docs/_includes/js/dropdowns.html index 7d8c50bdca..37566954aa 100644 --- a/docs/_includes/js/dropdowns.html +++ b/docs/_includes/js/dropdowns.html @@ -134,7 +134,7 @@

To keep URLs intact with link buttons, use the data-target attribute instead of href="#".

{% highlight html %}