rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-07-23 21:22:52 -07:00
commit 2447f03758
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javascript.html
View File

@ -1556,7 +1556,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
{% endhighlight %} {% endhighlight %}
<div class="bs-callout bs-callout-info"> <div class="bs-callout bs-callout-info">
<h4>Glyphicon Alternative</h4> <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> </div>
<h3>Optional captions</h3> <h3>Optional captions</h3>

2
js/dropdown.js
View File

@ -42,7 +42,7 @@
if (!isActive) { if (!isActive) {
if ('ontouchstart' in document.documentElement) { if ('ontouchstart' in document.documentElement) {
// if mobile we we use a backdrop because click events don't delegate // 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')) $parent.trigger(e = $.Event('show.bs.dropdown'))