diff options
| author | Mark Otto <[email protected]> | 2016-02-03 19:23:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-03 19:23:29 -0800 |
| commit | 0e70c6a37f1a648f86331498e7e898ca86a5d912 (patch) | |
| tree | a1adab43cd51d99be99b36702ba9e1848e836962 /docs/components | |
| parent | 40525eaa4dd5bed19a0aab4c20602f613591c5fc (diff) | |
| parent | 19be5360835e13c3087c37f0862aa9872f661bd7 (diff) | |
| download | bootstrap-0e70c6a37f1a648f86331498e7e898ca86a5d912.tar.xz bootstrap-0e70c6a37f1a648f86331498e7e898ca86a5d912.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/forms.md | 2 | ||||
| -rw-r--r-- | docs/components/popovers.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/components/forms.md b/docs/components/forms.md index 58fd41ac0..e6439ae25 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -271,7 +271,7 @@ The `.form-group` class is the easiest way to add some structure to forms. Its o ### Inline forms -Use the `.form-inline` class to to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently: +Use the `.form-inline` class to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently: - Controls are `display: inline-block` to provide alignment control via `vertical-align` and `margin`. - Controls receive `width: auto` to override the Bootstrap default `width: 100%`. diff --git a/docs/components/popovers.md b/docs/components/popovers.md index 9621bb7d8..727189083 100644 --- a/docs/components/popovers.md +++ b/docs/components/popovers.md @@ -268,7 +268,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap <td>offsets</td> <td>string</td> <td>'0 0'</td> - <td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#constraints">offset docs</a>.</td> + <td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#offset">offset docs</a>.</td> </tr> </tbody> </table> |