Merge branch 'master' into 3.0.0-wip

Conflicts: docs/assets/js/bootstrap.min.js
2026-06-05 16:42:29 +03:00 · 2013-02-07 22:18:53 -08:00
parent a9729c5fd0 8c7f9c66a7
commit 2aa1a4dc70
12 changed files with 71 additions and 33 deletions
@@ -736,6 +736,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
          </div>{{! /example }}


+          <h3>{{_i}}Tooltips in input groups{{/i}}</h3>
+          <p>{{_i}}When using tooltips and popovers with the Bootstrap input groups, you'll have to set the <code>container</code> (documented below) option to avoid unwanted side effects.{{/i}}</p>
+
          <hr class="bs-docs-separator">