diff options
| author | Mark Otto <[email protected]> | 2014-01-05 17:50:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-05 17:50:07 -0800 |
| commit | 78e6036c680594266e4e7c08d0c44cb13e9d98a4 (patch) | |
| tree | 0d2ef6ff7e05d40f698caf46ea0ccc071874c520 /docs/components.html | |
| parent | ed5c7baaf1e17ba87a18a0ebb13dacb6e8e8bb03 (diff) | |
| parent | 990303ab540cbbdd43ebdd017c540daa6551db8c (diff) | |
| download | bootstrap-78e6036c680594266e4e7c08d0c44cb13e9d98a4.tar.xz bootstrap-78e6036c680594266e4e7c08d0c44cb13e9d98a4.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index b864d594d..503b612f6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -750,7 +750,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <div class="page-header"> <h1 id="input-groups">Input groups</h1> </div> - <p class="lead">Extend form controls by adding text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.input-group-addon</code> to prepend or append elements to a <code>.form-control</code>.</p> + <p class="lead">Extend form controls by adding text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.input-group-addon</code> to prepend or append elements to a single <code>.form-control</code>.</p> <div class="bs-callout bs-callout-danger"> <h4>Cross-browser compatibility</h4> @@ -767,7 +767,9 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <h2 id="input-groups-basic">Basic example</h2> - <p>Place one add-on or button on either side of an input. You may also place one on both sides of an input. <strong class="text-danger">We do not support multiple add-ons on a single side.</strong></p> + <p>Place one add-on or button on either side of an input. You may also place one on both sides of an input.</p> + <p><strong class="text-danger">We do not support multiple add-ons on a single side.</strong></p> + <p><strong class="text-danger">We do not support multiple form-controls in a single input group.</strong></p> <form class="bs-example bs-example-form" role="form"> <div class="input-group"> <span class="input-group-addon">@</span> |