aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-01-15 17:07:08 -0800
committerChris Rebert <[email protected]>2014-01-15 17:24:57 -0800
commit0ef8d1bad4cb146961c32a063f12a87116214d9e (patch)
tree5a21856ffbfe1dcbbb18017e37956f48424ac6fd /docs/components.html
parent78e81a1de99b23aae96ceec81499490538aafbb5 (diff)
downloadbootstrap-0ef8d1bad4cb146961c32a063f12a87116214d9e.tar.xz
bootstrap-0ef8d1bad4cb146961c32a063f12a87116214d9e.zip
reassert #12231 & #12232 (merge went badly?)
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/components.html b/docs/components.html
index f62a83321..259354e7f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -746,13 +746,13 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<h4>Cross-browser compatibility</h4>
<p>Avoid using <code>&lt;select&gt;</code> elements here as they cannot be fully styled in WebKit browsers.</p>
</div>
- <div class="bs-callout bs-callout-info">
+ <div class="bs-callout bs-callout-warning">
<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>