diff options
| author | Mark Otto <[email protected]> | 2014-01-14 21:46:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-14 21:46:46 -0800 |
| commit | 96031c101d64bccc47c3457f04b43b96b7f7f7b6 (patch) | |
| tree | f8dcfce7b0bf652caf38c35500930d279f7af4aa | |
| parent | b93ce03f19079aaf977125ba27318df0107057eb (diff) | |
| parent | 488443c9ad477ebd7f3c22db5caf088faf08f31a (diff) | |
| download | bootstrap-96031c101d64bccc47c3457f04b43b96b7f7f7b6.tar.xz bootstrap-96031c101d64bccc47c3457f04b43b96b7f7f7b6.zip | |
Merge pull request #12231 from twbs/callouts
callout severity tweaks
| -rw-r--r-- | docs/components.html | 8 | ||||
| -rw-r--r-- | docs/css.html | 4 | ||||
| -rw-r--r-- | docs/javascript.html | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docs/components.html b/docs/components.html index 4caa9e6f2..a400d216d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -185,7 +185,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, </div> <p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="../javascript/#buttons">our buttons plugin</a>.</p> - <div class="bs-callout bs-callout-info"> + <div class="bs-callout bs-callout-warning"> <h4>Tooltips & popovers in button groups require special setting</h4> <p>When using tooltips or popovers on elements within a <code>.btn-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> @@ -755,11 +755,11 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <h4>Cross-browser compatibility</h4> <p>Avoid using <code><select></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 & 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> </div> @@ -1432,7 +1432,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <p>There are some caveats regarding using form controls within fixed elements on mobile devices. <a href="../getting-started/#support-fixed-position-keyboards">See our browser support docs</a> for details.</p> </div> - <div class="bs-callout bs-callout-danger"> + <div class="bs-callout bs-callout-warning"> <h4>Always add labels</h4> <p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline navbar forms, you can hide the labels using the <code>.sr-only</code> class.</p> </div> diff --git a/docs/css.html b/docs/css.html index d8d6b8bb5..643d1dc0e 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1588,7 +1588,7 @@ For example, <code><section></code> should be wrapped as inline. <h4>Requires custom widths</h4> <p>Inputs, selects, and textareas are 100% wide by default in Bootstrap. To use the inline form, you'll have to set a width on the form controls used within.</p> </div> - <div class="bs-callout bs-callout-danger"> + <div class="bs-callout bs-callout-warning"> <h4>Always add labels</h4> <p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the <code>.sr-only</code> class.</p> </div> @@ -2369,7 +2369,7 @@ For example, <code><section></code> should be wrapped as inline. <img src="..." alt="..." class="img-thumbnail"> {% endhighlight %} - <div class="bs-callout bs-callout-warning"> + <div class="bs-callout bs-callout-info"> <h4>Responsive images</h4> <p>Looking for how to make images more responsive? <a href="#overview-responsive-images">Check out the responsive images section</a> up top.</p> </div> diff --git a/docs/javascript.html b/docs/javascript.html index d7035d661..b568ff7a7 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -925,7 +925,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { <h4>Opt-in functionality</h4> <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p> </div> - <div class="bs-callout bs-callout-info"> + <div class="bs-callout bs-callout-warning"> <h4>Tooltips in button groups and input groups require special setting</h4> <p>When using tooltips on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip is triggered).</p> </div> @@ -1110,7 +1110,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { <h4>Opt-in functionality</h4> <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p> </div> - <div class="bs-callout bs-callout-info"> + <div class="bs-callout bs-callout-warning"> <h4>Popovers in button groups and input groups require special setting</h4> <p>When using popovers on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).</p> </div> |
