diff options
| author | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
| commit | bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80 (patch) | |
| tree | dbeab5560ca6760fa65e9f342c517dcbe56475f9 /docs/components.html | |
| parent | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (diff) | |
| parent | 80c9c14ab956459f07a7f1de8693a2ab693bcb51 (diff) | |
| download | bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.tar.xz bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/getting-started.html
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index 680e34e13..c20591de3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -760,8 +760,8 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <p>When using tooltips or popovers on elements within an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p> </div> <div class="bs-callout bs-callout-info"> - <h4>Don't mix with form groups</h4> - <p>Do not apply input group classes directly to form groups. An input group is an isolated component.</p> + <h4>Don't mix with other components</h4> + <p>Do not mix form group or grid column classes directly with input groups.</p> </div> |