]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #15111 from twbs/events-tables-wrapping
authorChris Rebert <github@rebertia.com>
Thu, 20 Nov 2014 08:06:33 +0000 (00:06 -0800)
committerChris Rebert <github@rebertia.com>
Thu, 20 Nov 2014 08:06:33 +0000 (00:06 -0800)
Don't line wrap event names in JS plugin docs

1  2 
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html

Simple merge
index 1cc785b2d07d0c23e7db17aa47221163a2f24543,1bfea563c98bca4e6d583aa06addeaeea203bc71..683453096d14bf090f29e6591701b098035056e5
@@@ -164,9 -164,8 +164,9 @@@ $('.dropdown-toggle').dropdown(
  
    <h3 id="dropdowns-events">Events</h3>
    <p>All dropdown events are fired at the <code>.dropdown-menu</code>'s parent element.</p>
 +  <p>All dropdown events have a <code>relatedTarget</code> property, whose value is the toggling anchor element.</p>
    <div class="table-responsive">
-     <table class="table table-bordered table-striped">
+     <table class="table table-bordered table-striped bs-events-table">
        <thead>
          <tr>
            <th style="width: 150px;">Event Type</th>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge