diff options
| author | Mark Otto <[email protected]> | 2015-08-25 00:27:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-25 00:27:44 -0700 |
| commit | ebc0a56c6f66b189665f2d7ff1c947bfeaf3a677 (patch) | |
| tree | f7e3d51437eed46ccbded361166335d7d48aa27a /docs | |
| parent | facb3a0c3c3f240ae4490019639cf2d6bc2eb53f (diff) | |
| parent | 37b00133ae9da22b58865c1ecab6af2e075a5e25 (diff) | |
| download | bootstrap-ebc0a56c6f66b189665f2d7ff1c947bfeaf3a677.tar.xz bootstrap-ebc0a56c6f66b189665f2d7ff1c947bfeaf3a677.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/footer.html | 4 | ||||
| -rw-r--r-- | docs/components/dropdowns.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 48074e384..f02cd4ba7 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -3,8 +3,8 @@ <ul class="bd-footer-links"> <li><a href="{{ site.repo }}">GitHub</a></li> <li><a href="https://twitter.com/getbootstrap">Twitter</a></li> - <li><a href="../getting-started/#examples">Examples</a></li> - <li><a href="../about/">About</a></li> + <li><a href="{{ site.baseurl }}/examples/">Examples</a></li> + <li><a href="{{ site.baseurl }}/about/history/">About</a></li> </ul> <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p> <p>Currently v{{ site.current_version }}. Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p> diff --git a/docs/components/dropdowns.md b/docs/components/dropdowns.md index 037e0d1cf..785913dc4 100644 --- a/docs/components/dropdowns.md +++ b/docs/components/dropdowns.md @@ -4,7 +4,7 @@ title: Dropdowns group: components --- -Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. +Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision.](http://markdotto.com/2012/02/27/bootstrap-explained-dropdowns/) ## Contents |