Commit 2447f037 authored by Mark Otto's avatar Mark Otto

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents ced204c7 faba6808
......@@ -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>
......
......@@ -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'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment