diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html index 2b44c8acc7..05a9c0b856 100644 --- a/docs/_includes/nav-docs.html +++ b/docs/_includes/nav-docs.html @@ -1,5 +1,5 @@
- +
diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index cea237de0c..ab3a48dde2 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -83,7 +83,7 @@ .bd-example { position: relative; padding: 1rem; - margin: 1rem -1rem; + margin: 1rem (-$grid-gutter-width-base / 2); border: solid #f7f7f9; border-width: .2rem 0 0; @include clearfix(); diff --git a/docs/components/alerts.md b/docs/components/alerts.md index da72e322e5..dae4ec7d36 100644 --- a/docs/components/alerts.md +++ b/docs/components/alerts.md @@ -55,12 +55,13 @@ Use the `.alert-link` utility class to quickly provide matching colored links wi ### Additional content -Alerts can also contain additional HTML elements like headings and paragraphs. +Alerts can also contain additional HTML elements like headings, paragraphs and dividers. {% example html %} {% endexample %} diff --git a/docs/components/badge.md b/docs/components/badge.md index 4e4bafcde0..896c917f3c 100644 --- a/docs/components/badge.md +++ b/docs/components/badge.md @@ -53,3 +53,16 @@ Use the `.badge-pill` modifier class to make badges more rounded (with a larger Warning Danger {% endexample %} + +## Links + +Using the `.badge` classes with the `` element quickly provide _actionable_ badges with hover and focus states. + +{% example html %} +Default +Primary +Success +Info +Warning +Danger +{% endexample %} diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 18d1c1298b..c269bb3828 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -40,7 +40,7 @@ You can use a link with the `href` attribute, or a button with the `data-target` ## Accordion example -Extend the default collapse behavior to create an accordion. +Using the [card]({{ site.baseurl }}/components/card) component, you can extend the default collapse behavior to create an accordion. {% example html %}
diff --git a/docs/content/images.md b/docs/content/images.md index fc8cda6b43..a892064888 100644 --- a/docs/content/images.md +++ b/docs/content/images.md @@ -25,9 +25,9 @@ Images in Bootstrap are made responsive with `.img-fluid`. `max-width: 100%;` an {% endhighlight %} {% callout warning %} -#### SVG images and IE 9-10 +#### SVG images and IE 10 -In Internet Explorer 9-10, SVG images with `.img-fluid` are disproportionately sized. To fix this, add `width: 100% \9;` where necessary. This fix improperly sizes other image formats, so Bootstrap doesn't apply it automatically. +In Internet Explorer 10, SVG images with `.img-fluid` are disproportionately sized. To fix this, add `width: 100% \9;` where necessary. This fix improperly sizes other image formats, so Bootstrap doesn't apply it automatically. {% endcallout %} ## Image thumbnails diff --git a/docs/getting-started/accessibility.md b/docs/getting-started/accessibility.md index c1fe73dc01..33619eb1ea 100644 --- a/docs/getting-started/accessibility.md +++ b/docs/getting-started/accessibility.md @@ -48,7 +48,7 @@ Note that this bug will also affect any other in-page links your site may be usi When nesting headings (`

` - `

`), your primary document header should be an `

`. Subsequent headings should make logical use of `

` - `

` such that screen readers can construct a table of contents for your pages. -Learn more at [HTML CodeSniffer](https://squizlabs.github.io/HTML_CodeSniffer/Standards/Section508/) and [Penn State's Accessability](http://accessibility.psu.edu/headings/). +Learn more at [HTML CodeSniffer](https://squizlabs.github.io/HTML_CodeSniffer/Standards/Section508/) and [Penn State's Accessibility](http://accessibility.psu.edu/headings/). ## Additional resources diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 736b9ed12d..04aa2c9ada 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -169,7 +169,6 @@ We don't encourage customization of these values; should you change one, you lik ```scss $zindex-dropdown-backdrop: 990 !default; -$zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; $zindex-fixed: 1030 !default; $zindex-sticky: 1030 !default; diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md index e207737d1a..c3f0c00901 100644 --- a/docs/layout/responsive-utilities.md +++ b/docs/layout/responsive-utilities.md @@ -28,11 +28,11 @@ Try to use these on a limited basis and avoid creating entirely different versio Extra small devices - Portrait phones (<544px) + Portrait phones (<576px) Small devices - Landscape phones (≥544px - <768px) + Landscape phones (≥576px - <768px) Medium devices diff --git a/docs/migration.md b/docs/migration.md index cb4b134101..5e623317eb 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -170,11 +170,11 @@ The navbar has been entirely rewritten in flexbox with improved support for alig - An explicit class, `.breadcrumb-item`, is now required on the descendants of `.breadcrumb`s -### Labels, badges, and tags +### Labels and badges -- Renamed `.label` to `.tag` to disambiguate from the `