diff options
| author | Mark Otto <[email protected]> | 2015-04-25 23:53:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-04-25 23:53:25 -0700 |
| commit | e815696dacf5fa33e0f75c3b3f433ad90e3e417a (patch) | |
| tree | ed53fdaae2d66828dd3d857816a08d4e65726ea4 /docs/components | |
| parent | 3117c98f13af2124bed8523275cd83d4afd4edc6 (diff) | |
| parent | 20543d546202de8fbad13c7d0ab4a1fc19cd13b5 (diff) | |
| download | bootstrap-e815696dacf5fa33e0f75c3b3f433ad90e3e417a.tar.xz bootstrap-e815696dacf5fa33e0f75c3b3f433ad90e3e417a.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/card.md | 2 | ||||
| -rw-r--r-- | docs/components/forms.md | 2 | ||||
| -rw-r--r-- | docs/components/reboot.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/components/card.md b/docs/components/card.md index 715c5eb3e..2dfc68c84 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -21,7 +21,7 @@ Cards require very little markup, but do require some additional classes to give ### Sizing -Cards are block-leve by default, so they'll fill the available horizontal space. Constrain their widths via custom styles, our predefined grid classes, or our grid mixins. +Cards are block-level by default, so they'll fill the available horizontal space. Constrain their widths via custom styles, our predefined grid classes, or our grid mixins. {% example html %} <div class="card" style="width: 20rem;"> diff --git a/docs/components/forms.md b/docs/components/forms.md index 827912cb5..bf72dbd3c 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -185,7 +185,7 @@ Use the `.inline-form` class to to display a series of labels, form controls, an - Controls receive `width: auto` to override the Bootstrap default `width: 100%`. - Controls **only appear inline in viewports that are at least 768px wide** to account for narrow viewports on mobile devices. -Because of this, you may need to manually adddres the width and alignment of individual form controls. Lastly, as shown below, you should always include a `<label>` with each form control. +Because of this, you may need to manually address the width and alignment of individual form controls. Lastly, as shown below, you should always include a `<label>` with each form control. #### Visible labels diff --git a/docs/components/reboot.md b/docs/components/reboot.md index d41e4e303..baed24d1e 100644 --- a/docs/components/reboot.md +++ b/docs/components/reboot.md @@ -118,7 +118,7 @@ Tables are slightly adjusted to style `<caption>`s and ensure consistent `text-a <div class="bd-example"> <table> <caption> - This is an example table, and this is it's caption to describe the contents. + This is an example table, and this is its caption to describe the contents. </caption> <thead> <tr> |