diff options
| author | Mark Otto <[email protected]> | 2012-02-21 13:52:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-21 13:52:02 -0800 |
| commit | bb16b9bef200f269af545e13280254edc6b3f880 (patch) | |
| tree | 1be354ae99c14527994cb1b25a12106d62af0530 /docs | |
| parent | 664a5c443849880972cf62aa85306be269d09270 (diff) | |
| download | bootstrap-bb16b9bef200f269af545e13280254edc6b3f880.tar.xz bootstrap-bb16b9bef200f269af545e13280254edc6b3f880.zip | |
fix second part of #1962
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53853 -> 53853 bytes | |||
| -rw-r--r-- | docs/components.html | 5 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex c6078d9fc..0ce1a29eb 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/components.html b/docs/components.html index 67353828e..172fbcf20 100644 --- a/docs/components.html +++ b/docs/components.html @@ -176,9 +176,8 @@ <h3>Checkbox and radio flavors</h3> <p>Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View <a href="./javascript.html#buttons">the Javascript docs</a> for that.</p> <p><a class="btn js-btn" href="./javascript.html#buttons">Get the javascript »</a></p> - <hr> - <h4 class="muted">Heads up</h4> - <p class="muted">CSS for button groups is in a separate file, button-groups.less.</p> + <h3>Dropdowns in button groups</h3> + <p><span class="label label-info">Heads up!</span> Buttons with dropdowns must be individually wrapped in their own <code>.btn-group</code> within a <code>.btn-toolbar</code> for proper rendering.</p> </div> </div> </section> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 54f354932..3a176fa44 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -100,9 +100,8 @@ <h3>{{_i}}Checkbox and radio flavors{{/i}}</h3> <p>{{_i}}Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View <a href="./javascript.html#buttons">the Javascript docs</a> for that.{{/i}}</p> <p><a class="btn js-btn" href="./javascript.html#buttons">{{_i}}Get the javascript »{{/i}}</a></p> - <hr> - <h4 class="muted">{{_i}}Heads up{{/i}}</h4> - <p class="muted">{{_i}}CSS for button groups is in a separate file, button-groups.less.{{/i}}</p> + <h3>{{_i}}Dropdowns in button groups{{/i}}</h3> + <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Buttons with dropdowns must be individually wrapped in their own <code>.btn-group</code> within a <code>.btn-toolbar</code> for proper rendering.{{/i}}</p> </div> </div> </section> |