aboutsummaryrefslogtreecommitdiff
path: root/docs/components
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-03-07 20:44:42 -0800
committerMark Otto <[email protected]>2017-03-07 20:44:42 -0800
commit7e07d5bf2e5ed22d3997bacf8395ef6d0f0b99d1 (patch)
tree6e96a5b4e21aa1d49643b5a3abb960c767b4f63f /docs/components
parent07f63324d1f9447641d6d932872cea05aff5107f (diff)
parent95f37e4c402df37db16781995ffa1592032df9c8 (diff)
downloadbootstrap-7e07d5bf2e5ed22d3997bacf8395ef6d0f0b99d1.tar.xz
bootstrap-7e07d5bf2e5ed22d3997bacf8395ef6d0f0b99d1.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/badge.md2
-rw-r--r--docs/components/collapse.md2
-rw-r--r--docs/components/modal.md4
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/components/badge.md b/docs/components/badge.md
index 896c917f3..a7497a285 100644
--- a/docs/components/badge.md
+++ b/docs/components/badge.md
@@ -1,7 +1,7 @@
---
layout: docs
title: Badges
-description: Documentation and examples for badges, our small count and labelling component.
+description: Documentation and examples for badges, our small count and labeling component.
group: components
---
diff --git a/docs/components/collapse.md b/docs/components/collapse.md
index c269bb382..8942c85a4 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
-Using the [card]({{ site.baseurl }}/components/card) component, you can 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 %}
<div id="accordion" role="tablist">
diff --git a/docs/components/modal.md b/docs/components/modal.md
index 81f917f25..deb25c4dc 100644
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@@ -20,7 +20,7 @@ Before getting started with Bootstrap's modal component, be sure to read the fol
- Clicking on the modal "backdrop" will automatically close the modal.
- Bootstrap only supports one modal window at a time. Nested modals aren't supported as we believe them to be poor user experiences.
- Modals use `position: fixed`, which can sometimes be a bit particular about its rendering. Whenever possible, place your modal HTML in a top-level position to avoid potential interference from other elements. You'll likely run into issues when nesting a `.modal` within another fixed element.
-- One again, due to `position: fixed`, there are some caveats with using modals on mobile devices. [See our browser support docs]({{ site.baseurl }}/getting-started/browsers-devices/#modals-and-dropdowns-on-mobile) for details.
+- Once again, due to `position: fixed`, there are some caveats with using modals on mobile devices. [See our browser support docs]({{ site.baseurl }}/getting-started/browsers-devices/#modals-and-dropdowns-on-mobile) for details.
- Lastly, the `autofocus` HTML attribute has no effect in modals. Here's how you can achieve the same effect with custom JavaScript.
Keep reading for demos and usage guidelines.
@@ -347,7 +347,7 @@ Utilize the Bootstrap grid system within a modal by nesting `.container-fluid` w
### Varying modal content
-Have a bunch of buttons that all trigger the same modal with slightly different contents? Use `event.relatedTarget` and [HTML `data-*` attributes](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes) (possibly [via jQuery](https://api.jquery.com/data/)) to vary the contents of the modal depending on which button was clicked.
+Have a bunch of buttons that all trigger the same modal with slightly different contents? Use `event.relatedTarget` and [HTML `data-*` attributes](https://developer.mozilla.org/en-US/docs/Learn/HTML/Howto/Use_data_attributes) (possibly [via jQuery](https://api.jquery.com/data/)) to vary the contents of the modal depending on which button was clicked.
Below is a live demo followed by example HTML and JavaScript. For more information, [read the modal events docs](#events) for details on `relatedTarget`.