diff options
| author | Mark Otto <[email protected]> | 2013-07-23 21:22:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-23 21:22:52 -0700 |
| commit | 2447f0375879b8db0461b8870e5eb5e0280fdc87 (patch) | |
| tree | c779a1d2bb0edab462beec8f9ec5556434485d1a | |
| parent | ced204c7746e7ead0c9da02edbbd785e08792422 (diff) | |
| parent | faba6808b7713e8ab72ae5f21eedb3736a5b45ea (diff) | |
| download | bootstrap-2447f0375879b8db0461b8870e5eb5e0280fdc87.tar.xz bootstrap-2447f0375879b8db0461b8870e5eb5e0280fdc87.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | javascript.html | 2 | ||||
| -rw-r--r-- | js/dropdown.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/javascript.html b/javascript.html index 9d39c0a88..d39d9c321 100644 --- a/javascript.html +++ b/javascript.html @@ -1556,7 +1556,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () { {% endhighlight %} <div class="bs-callout bs-callout-info"> <h4>Glyphicon Alternative</h4> - <p>With <a href="/css/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon-chevron-left</code> and <code>.glyphicon-chevron-right</code>.</p> + <p>With <a href="/css/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p> </div> <h3>Optional captions</h3> diff --git a/js/dropdown.js b/js/dropdown.js index 8aee574fa..5bf051e86 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -42,7 +42,7 @@ if (!isActive) { if ('ontouchstart' in document.documentElement) { // if mobile we we use a backdrop because click events don't delegate - $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus) + $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus) } $parent.trigger(e = $.Event('show.bs.dropdown')) |