mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_remove_icons

Browse Source 
Conflicts:
	docs/components.html
This commit is contained in:
Mark Otto
2013-06-27 18:49:05 -07:00
parent f64fe29003 cb483b6758
commit 62f76ad33f
28 changed files with 338 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/components.html
+6 -2
View File
@@ -6,7 +6,6 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
---
<!-- Dropdowns
================================================== -->
<div class="bs-docs-section" id="dropdowns">
@@ -168,6 +167,11 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</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.html#buttons">our buttons plugin</a>.</p>
<div class="bs-callout">
<h4>Tooltips &amp; 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>
<h3 id="btn-groups-single">Basic button group</h3>
<p>Wrap a series of buttons with <code>.btn</code> in <code>.btn-group</code>.</p>
<div class="bs-example">
@@ -628,7 +632,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
{% highlight html %}
<ul class="nav nav-tabs">
<ul class="nav nav-pills">
...
<li class="disabled"><a href="#">Disabled link</a></li>
...