From: Mark Otto <markdotto@gmail.com>
Date: Wed, 15 Jan 2014 05:47:24 +0000 (-0800)
Subject: Merge pull request #12232 from twbs/mixing-docs
X-Git-Tag: v3.1.0~103^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1facbf6e7a32cfb1334e9c84a59c762c27f13cb5;p=thirdparty%2Fbootstrap.git

Merge pull request #12232 from twbs/mixing-docs

clarify docs regarding non-mixable components
---

1facbf6e7a32cfb1334e9c84a59c762c27f13cb5
diff --cc docs/components.html
index a400d216dc,0db89d977d..ec15779b13
--- a/docs/components.html
+++ b/docs/components.html
@@@ -759,9 -759,9 +759,9 @@@ lead: "Over a dozen reusable component
        <h4>Tooltips &amp; popovers in input groups require special setting</h4>
        <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">
 +    <div class="bs-callout bs-callout-warning">
        <h4>Don't mix with other components</h4>
-       <p>Do not mix form group or grid column classes directly with input groups.</p>
+       <p>Do not mix form groups or grid column classes directly with input groups. Instead, nest the input group inside of the form group or grid-related element.</p>
      </div>