diff options
| author | fat <[email protected]> | 2013-02-07 19:47:01 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-07 19:47:01 -0800 |
| commit | 1bf070b4ce5ee40e4d248053d109c179bb42caf9 (patch) | |
| tree | 1a0b056458f535457f362bd8cbabfded837b5aab /docs/templates | |
| parent | d8a7a380bcfd25c66ca1dc54d1619dc272f4bbb4 (diff) | |
| parent | e3f3542d0b57fdcea0fbff2858b610f85a988d1d (diff) | |
| download | bootstrap-1bf070b4ce5ee40e4d248053d109c179bb42caf9.tar.xz bootstrap-1bf070b4ce5ee40e4d248053d109c179bb42caf9.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/layout.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 01cf319c2..993b44620 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -97,7 +97,7 @@ <li class="muted">·</li> <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li> <li class="muted">·</li> - <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li> + <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">{{_i}}Changelog{{/i}}</a></li> </ul> </div> </footer> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 9a08a50b3..744988f4b 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -715,6 +715,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"> |