From b9e59e96afa93eb7b0606b92853d91d6ac171f4c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 15 Feb 2019 23:36:44 +0200 Subject: Replace `master` with `v3-dev` after the branch switch. (#28287) --- docs/_includes/getting-started/browser-device-support.html | 8 ++++---- docs/_includes/getting-started/grunt.html | 2 +- docs/_includes/getting-started/license.html | 2 +- docs/_includes/getting-started/whats-included.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/_includes/getting-started') diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html index bfcc00e2e..0fc0ee4d6 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 248442189..f4e6d4ecb 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 06ece5c70..190c953a2 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 a82c11889..eb9e648e2 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

    -- cgit v1.2.3