Merge branch 'v4-dev' into stretched-link

site/_includes/callout.html

@@ -4,6 +4,6 @@
   and type is one of: info (default), danger, warning
 {%- endcomment -%}
 {%- assign css_class = include.type | default: "info" -%}
-<div class="bd-callout bd-callout-{{ css_class }} no_toc_section">
+<div class="bd-callout bd-callout-{{ css_class }}">
   {{- include.content | markdownify -}}
 </div>

site/_includes/icons/bootstrap-stack.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" {% if include.class %} class="{{ include.class }}"{% endif %}{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %} viewBox="0 0 1024 860"><defs><linearGradient id="c" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#5C24AE"/><stop offset="100%" stop-color="#30135A"/></linearGradient><path id="b" d="M355.967 242.807l-322 216.395c-44.275 29.754-44.275 78.443 0 108.197l322 216.395c44.275 29.754 116.725 29.754 161 0l322-216.395c44.275-29.754 44.275-78.443 0-108.197l-322-216.395c-44.275-29.754-116.725-29.754-161 0z"/><filter id="a" width="108%" height="112%" x="-4%" y="-4.3%" filterUnits="objectBoundingBox"><feOffset dy="10" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="10"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/></filter><linearGradient id="f" x1="50%" x2="50%" y1="-17.303%" y2="100%"><stop offset="0%" stop-color="#7331D4"/><stop offset="100%" stop-color="#461B84"/></linearGradient><path id="e" d="M355.967 132.807l-322 216.395c-44.275 29.754-44.275 78.443 0 108.197l322 216.395c44.275 29.754 116.725 29.754 161 0l322-216.395c44.275-29.754 44.275-78.443 0-108.197l-322-216.395c-44.275-29.754-116.725-29.754-161 0z"/><filter id="d" width="108%" height="112%" x="-4%" y="-4.3%" filterUnits="objectBoundingBox"><feOffset dy="10" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="10"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/></filter><linearGradient id="i" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#905BDD"/><stop offset="100%" stop-color="#5521A0"/></linearGradient><path id="h" d="M355.967 22.807l-322 216.395c-44.275 29.754-44.275 78.443 0 108.197l322 216.395c44.275 29.754 116.725 29.754 161 0l322-216.395c44.275-29.754 44.275-78.443 0-108.197l-322-216.395c-44.275-29.754-116.725-29.754-161 0z"/><filter id="g" width="108%" height="112%" x="-4%" y="-4.3%" filterUnits="objectBoundingBox"><feOffset dy="10" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="10"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/></filter></defs><g fill="none"><g transform="translate(75 23)"><use fill="#000" filter="url(#a)" xlink:href="#b"/><use fill="url(#c)" xlink:href="#b"/></g><g transform="translate(75 23)"><use fill="#000" filter="url(#d)" xlink:href="#e"/><use fill="url(#f)" xlink:href="#e"/></g><g transform="translate(75 23)"><use fill="#000" filter="url(#g)" xlink:href="#h"/><use fill="url(#i)" xlink:href="#h"/></g><path fill="#FFF" d="M558.273 447.667L308.036 279.5l97.982-65.847c42.83-28.784 96.789-31.483 134.245-6.311 26.044 17.502 31.214 46.615 11.444 65.724l1.389.934c38.324-19.932 84.107-18.527 117.396 3.845 44.046 29.6 38.671 68.419-14.561 104.193l-97.658 65.629zM447.112 331.01l49.942-33.562c36.935-24.822 42.31-48.249 15.224-66.451-24.798-16.665-55.49-14.453-85.851 5.95l-59.641 40.081 80.326 53.982zm176.532 35.663c37.63-25.289 42.136-48.832 13.203-68.276-28.932-19.444-64.163-15.614-104.042 11.186l-58.789 39.508 87.92 59.084 61.708-41.502z"/></g></svg>

site/_includes/scripts.html

@@ -14,6 +14,7 @@
 {%- if jekyll.environment == "production" -%}
   <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/js/docs.min.js"></script>
 {%- else -%}
+  <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/js/vendor/anchor.min.js"></script>
   <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/js/vendor/clipboard.min.js"></script>
   <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/js/vendor/bs-custom-file-input.min.js"></script>
   <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/js/src/application.js"></script>

site/_includes/vendor/anchor_headings.html

@@ -1,86 +0,0 @@
-{% capture headingsWorkspace %}
-  {% comment %}
-    Version 1.0.0
-      https://github.com/allejo/jekyll-anchor-headings
-
-    "Be the pull request you wish to see in the world." ~Ben Balter
-
-    Usage:
-      {% include anchor_headings.html html=content %}
-
-    Parameters:
-      * html          (string) - the HTML of compiled markdown generated by kramdown in Jekyll
-
-    Optional Parameters:
-      * beforeHeading (bool)   : false  - Set to true if the anchor should be placed _before_ the heading's content
-      * anchorBody    (string) :  ''    - The content that will be placed inside the anchor; the `%heading%` placeholder is available
-      * anchorClass   (string) :  ''    - The class(es) that will be used for each anchor. Separate multiple classes with a space
-      * anchorTitle   (string) :  ''    - The `title` attribute that will be used for anchors
-      * h_min         (int)    :  1     - The minimum header level to build an anchor for; any header lower than this value will be ignored
-      * h_max         (int)    :  6     - The maximum header level to build an anchor for; any header greater than this value will be ignored
-
-    Output:
-      The original HTML with the addition of anchors inside of all of the h1-h6 headings.
-  {% endcomment %}
-
-  {% assign minHeader = include.h_min | default: 1 %}
-  {% assign maxHeader = include.h_max | default: 6 %}
-  {% assign beforeHeading = include.beforeHeading %}
-  {% assign nodes = include.html | split: '<h' %}
-
-  {% capture edited_headings %}{% endcapture %}
-
-  {% for node in nodes %}
-    {% if node == "" %}
-      {% continue %}
-    {% endif %}
-
-    {% assign headerLevel = node | replace: '"', '' | slice: 0, 1 | times: 1 %}
-
-    <!-- If the node doesn't have a header, then it's content before the first heading; don't discard it -->
-    {% if headerLevel < 1 or headerLevel > 6 %}
-      {% capture edited_headings %}{{ edited_headings }}{{ node }}{% endcapture %}
-      {% continue %}
-    {% endif %}
-
-    {% assign _workspace = node | split: '</h' %}
-    {% assign _idWorkspace = _workspace[0] | split: 'id="' %}
-    {% assign _idWorkspace = _idWorkspace[1] | split: '"' %}
-    {% assign html_id = _idWorkspace[0] %}
-
-    {% capture _hAttrToStrip %}{{ _workspace[0] | split: '>' | first }}>{% endcapture %}
-    {% assign header = _workspace[0] | replace: _hAttrToStrip, '' %}
-
-    <!-- Build the anchor to inject for our heading -->
-    {% capture anchor %}{% endcapture %}
-
-    {% if html_id and headerLevel >= minHeader and headerLevel <= maxHeader %}
-      {% capture anchor %}href="#{{ html_id}}"{% endcapture %}
-
-      {% if include.anchorClass %}
-        {% capture anchor %}{{ anchor }} class="{{ include.anchorClass }}"{% endcapture %}
-      {% endif %}
-
-      {% if include.anchorTitle %}
-        {% capture anchor %}{{ anchor }} title="{{ include.anchorTitle | replace: '%heading%', header }}"{% endcapture %}
-      {% endif %}
-
-      {% capture anchor %}<a {{ anchor }}>{{ include.anchorBody | replace: '%heading%', header | default: '' | raw }}</a>{% endcapture %}
-
-      {% if beforeHeading %}
-        {% capture anchor %}{{ anchor }} {% endcapture %}
-      {% else %}
-        {% capture anchor %} {{ anchor }}{% endcapture %}
-      {% endif %}
-    {% endif %}
-
-    <!-- The placement of our anchor, before the heading content or after -->
-    {% if beforeHeading %}
-      {% capture _current %}<h{{ _hAttrToStrip | raw }}{{ anchor }}{% endcapture %}
-      {% capture edited_headings %}{{ edited_headings }}{{ node | replace: _hAttrToStrip, _current | raw }}{% endcapture %}
-    {% else %}
-      {% capture _current %}<h{{ _workspace | first }}{{ anchor }}</h{{ _workspace | last }}{% endcapture %}
-      {% capture edited_headings %}{{ edited_headings }}{{ _current }}{% endcapture %}
-    {% endif %}
-  {% endfor %}
-{% endcapture %}{% assign headingsWorkspace = '' %}{{ edited_headings | strip }}

site/_layouts/docs.html

@@ -24,7 +24,7 @@
           <h1 class="bd-title" id="content">{{ page.title | smartify }}</h1>
           <p class="bd-lead">{{ page.description | smartify }}</p>
           {% include ads.html %}
-          {% include vendor/anchor_headings.html html=content h_min=2 h_max=5 anchorBody="#" anchorTitle="Permalink" anchorClass="bd-anchor" %}
+          {{ content }}
         </main>
       </div>
     </div>

site/docs/4.1/assets/js/src/application.js

@@ -10,7 +10,7 @@
  * details, see https://creativecommons.org/licenses/by/3.0/.
  */
 
-/* global ClipboardJS: false, bsCustomFileInput: false */
+/* global ClipboardJS: false, anchors: false, bsCustomFileInput: false */
 
 (function ($) {
   'use strict'
@@ -101,6 +101,10 @@
         .tooltip('_fixTitle')
     })
 
+    anchors.options = {
+      icon: '#'
+    }
+    anchors.add('.bd-content > h2, .bd-content > h3, .bd-content > h4, .bd-content > h5')
     $('.bd-content').children('h2, h3, h4, h5').wrapInner('<span class="bd-content-title"></span>')
 
     bsCustomFileInput.init()

site/docs/4.1/assets/scss/_anchor.scss

@@ -1,15 +1,10 @@
-.bd-anchor {
-  padding-left: .25rem;
+.anchorjs-link {
   font-weight: 400;
-  color: $link-color;
-  opacity: 0;
-  @include transition(opacity .16s linear);
+  color: rgba($link-color, .5);
+  @include transition(color .15s ease-in-out, opacity .15s ease-in-out);
 
-  :hover > &,
-  &:hover,
-  &:focus {
+  &:hover {
     color: $link-color;
     text-decoration: none;
-    opacity: 1;
   }
 }

site/docs/4.1/components/spinners.md

@@ -10,14 +10,16 @@ toc: true
 
 Bootstrap "spinners" can be used to show the loading state in your projects. They're built only with HTML and CSS, meaning you don't need any JavaScript to create them. You will, however, need some custom JavaScript to toggle their visibility. Their appearance, alignment, and sizing can be easily customized with our amazing utility classes.
 
-For accessibility purposes, each loader here includes `role="status"` and `Loading...` text within. We account for this in our CSS, using a text hiding technique to prevent it from rendering on screen.
+For accessibility purposes, each loader here includes `role="status"` and a nested `<span class="sr-only">Loading...</span>`.
 
 ## Border spinner
 
 Use the border spinners for a lightweight loading indicator.
 
 {% capture example %}
-<div class="spinner-border" role="status">Loading...</div>
+<div class="spinner-border" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
 {% endcapture %}
 {% include example.html content=example %}
 
@@ -27,7 +29,9 @@ The border spinner uses `currentColor` for its `border-color`, meaning you can c
 
 {% capture example %}
 {% for color in site.data.theme-colors %}
-<div class="spinner-border text-{{ color.name }}" role="status">Loading...</div>{% endfor %}
+<div class="spinner-border text-{{ color.name }}" role="status">
+  <span class="sr-only">Loading...</span>
+</div>{% endfor %}
 {% endcapture %}
 {% include example.html content=example %}
 
@@ -41,7 +45,9 @@ The border spinner uses `currentColor` for its `border-color`, meaning you can c
 If you don't fancy a border spinner, switch to the grow spinner. While it doesn't technically spin, it does repeatedly grow!
 
 {% capture example %}
-<div class="spinner-grow" role="status">Loading...</div>
+<div class="spinner-grow" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
 {% endcapture %}
 {% include example.html content=example %}
 
@@ -49,7 +55,9 @@ Once again, this spinner is built with `currentColor`, so you can easily change
 
 {% capture example %}
 {% for color in site.data.theme-colors %}
-<div class="spinner-grow text-{{ color.name }}" role="status">Loading...</div>{% endfor %}
+<div class="spinner-grow text-{{ color.name }}" role="status">
+  <span class="sr-only">Loading...</span>
+</div>{% endfor %}
 {% endcapture %}
 {% include example.html content=example %}
 
@@ -62,7 +70,9 @@ Spinners in Bootstrap are built with `rem`s, `currentColor`, and `display: inlin
 Use [margin utilities][margin] like `.m-5` for easy spacing.
 
 {% capture example %}
-<div class="spinner-border m-5" role="status">Loading...</div>
+<div class="spinner-border m-5" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
 {% endcapture %}
 {% include example.html content=example %}
 
@@ -74,7 +84,9 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
 
 {% capture example %}
 <div class="d-flex justify-content-center">
-  <div class="spinner-border" role="status">Loading...</div>
+  <div class="spinner-border" role="status">
+    <span class="sr-only">Loading...</span>
+  </div>
 </div>
 {% endcapture %}
 {% include example.html content=example %}
@@ -82,7 +94,7 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
 {% capture example %}
 <div class="d-flex align-items-center">
   <strong>Loading...</strong>
-  <div class="spinner-border ml-auto" role="status"></div>
+  <div class="spinner-border ml-auto" role="status" aria-hidden="true"></div>
 </div>
 {% endcapture %}
 {% include example.html content=example %}
@@ -91,7 +103,9 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
 
 {% capture example %}
 <div class="clearfix">
-  <div class="spinner-border float-right" role="status">Loading...</div>
+  <div class="spinner-border float-right" role="status">
+    <span class="sr-only">Loading...</span>
+  </div>
 </div>
 {% endcapture %}
 {% include example.html content=example %}
@@ -100,7 +114,9 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
 
 {% capture example %}
 <div class="text-center">
-  <div class="spinner-border" role="status">Loading...</div>
+  <div class="spinner-border" role="status">
+    <span class="sr-only">Loading...</span>
+  </div>
 </div>
 {% endcapture %}
 {% include example.html content=example %}
@@ -110,16 +126,24 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
 Add `.spinner-border-sm` and `.spinner-grow-sm` to make a smaller spinner that can quickly be used within other components.
 
 {% capture example %}
-<div class="spinner-border spinner-border-sm" role="status">Loading...</div>
-<div class="spinner-grow spinner-grow-sm" role="status">Loading...</div>
+<div class="spinner-border spinner-border-sm" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
+<div class="spinner-grow spinner-grow-sm" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
 {% endcapture %}
 {% include example.html content=example %}
 
 Or, use custom CSS or inline styles to change the dimensions as needed.
 
 {% capture example %}
-<div class="spinner-border" style="width: 3rem; height: 3rem;" role="status">Loading...</div>
-<div class="spinner-grow" style="width: 3rem; height: 3rem;" role="status">Loading...</div>
+<div class="spinner-border" style="width: 3rem; height: 3rem;" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
+<div class="spinner-grow" style="width: 3rem; height: 3rem;" role="status">
+  <span class="sr-only">Loading...</span>
+</div>
 {% endcapture %}
 {% include example.html content=example %}
 
@@ -129,10 +153,11 @@ Use spinners within buttons to indicate an action is currently processing or tak
 
 {% capture example %}
 <button class="btn btn-primary" type="button" disabled>
-  <span class="spinner-border spinner-border-sm" role="status">Loading...</span>
+  <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+  <span class="sr-only">Loading...</span>
 </button>
 <button class="btn btn-primary" type="button" disabled>
-  <span class="spinner-border spinner-border-sm" role="status"></span>
+  <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
   Loading...
 </button>
 {% endcapture %}
@@ -140,10 +165,11 @@ Use spinners within buttons to indicate an action is currently processing or tak
 
 {% capture example %}
 <button class="btn btn-primary" type="button" disabled>
-  <span class="spinner-grow spinner-grow-sm" role="status">Loading...</span>
+  <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
+  <span class="sr-only">Loading...</span>
 </button>
 <button class="btn btn-primary" type="button" disabled>
-  <span class="spinner-grow spinner-grow-sm" role="status"></span>
+  <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
   Loading...
 </button>
 {% endcapture %}

site/docs/4.1/content/reboot.md

@@ -33,9 +33,9 @@ The default web fonts (Helvetica Neue, Helvetica, and Arial) have been dropped i
 
 {% highlight sass %}
 $font-family-sans-serif:
-  // Safari for OS X and iOS (San Francisco)
+  // Safari for macOS and iOS (San Francisco)
   -apple-system,
-  // Chrome < 56 for OS X (San Francisco)
+  // Chrome < 56 for macOS (San Francisco)
   BlinkMacSystemFont,
   // Windows
   "Segoe UI",

site/docs/4.1/examples/.eslintrc.json

@@ -1,11 +0,0 @@
-{
-  "env": {
-    "es6": false,
-    "jquery": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 5,
-    "sourceType": "script"
-  },
-  "extends": "../../../../js/tests/unit/.eslintrc.json"
-}

site/docs/4.1/examples/floating-labels/floating-labels.css

@@ -40,6 +40,7 @@ body {
   margin-bottom: 0; /* Override default `<label>` margin */
   line-height: 1.5;
   color: #495057;
+  pointer-events: none;
   cursor: text; /* Match the input under the label */
   border: 1px solid transparent;
   border-radius: .25rem;

site/docs/4.1/examples/index.html

@@ -15,7 +15,9 @@ redirect_from:
     {% if forloop.first %}<div class="row">{% endif %}
       <div class="col-sm-6 col-md-4 col-xl-3 mb-3">
         <a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/{{ example.name | slugify }}/">
-          <img class="img-thumbnail mb-3" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/screenshots/{{ example.name | slugify }}.png" alt="{{ example.name }} screenshot" width="960" height="600">
+          <img class="img-thumbnail mb-3" srcset="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}.png,
+                                                  {{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}@2x.png 2x"
+                                          src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}.png" alt="{{ example.name }} screenshot" width="480" height="300">
           <h5 class="mb-1">{{ example.name }}</h5>
         </a>
         <p class="text-muted">{{ example.description }}</p>

site/docs/4.1/getting-started/contents.md

@@ -129,10 +129,12 @@ bootstrap/
 ├── dist/
 │   ├── css/
 │   └── js/
-├── docs/
-│   └── examples/
+├── site/
+│   └──docs/
+│      └── 4.1/
+│          └── examples/
 ├── js/
 └── scss/
 {% endhighlight %}
 
-The `scss/` and `js/` are the source code for our CSS and JavaScript. The `dist/` folder includes everything listed in the precompiled download section above. The `docs/` folder includes the source code for our documentation, and `examples/` of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.
+The `scss/` and `js/` are the source code for our CSS and JavaScript. The `dist/` folder includes everything listed in the precompiled download section above. The `site/docs/` folder includes the source code for our documentation, and `examples/` of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.

site/docs/4.1/migration.md

@@ -8,7 +8,7 @@ toc: true
 
 ## Stable changes
 
-Moving from Beta 3 to our stable v4.0 release, there are no breaking changes, but there are some notable changes.
+Moving from Beta 3 to our stable v4.x release, there are no breaking changes, but there are some notable changes.
 
 ### Printing
 - Fixed broken print utilities. Previously, using a `.d-print-*` class would unexpectedly overrule any other `.d-*` class. Now, they match our other display utilities and only apply to that media (`@media print`).

site/index.html

@@ -6,7 +6,7 @@ layout: home
   <div class="container">
     <div class="row align-items-center">
       <div class="col-6 mx-auto col-md-6 order-md-2">
-        <img class="img-fluid mb-3 mb-md-0" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-stack.png" alt="" width="1024" height="860">
+        {% include icons/bootstrap-stack.svg width="512" height="430" class="img-fluid mb-3 mb-md-0" %}
       </div>
       <div class="col-md-6 order-md-1 text-center text-md-left pr-md-5">
         <h1 class="mb-3 bd-text-purple-bright">Bootstrap</h1>
@@ -80,7 +80,9 @@ gem install bootstrap -v {{ site.current_ruby_version }}
     <p>
       Take Bootstrap 4 to the next level with official premium themes—toolkits built on Bootstrap with new components and plugins, docs, and build tools.
     </p>
-    <img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png" alt="Bootstrap Themes" width="1024" height="388">
+    <img class="img-fluid mt-3 mx-auto" srcset="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png,
+                                                {{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes@2x.png 2x"
+                                        src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png" alt="Bootstrap Themes" width="500" height="200">
     <hr class="half-rule">
     <a href="{{ site.themes }}/" class="btn btn-outline-primary">Browse themes</a>
   </div>