Skip to content

Commit

Permalink
Merge branch 'main' into main-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Jul 1, 2020
2 parents cecd2af + da9c7d1 commit 463ee9e
Show file tree
Hide file tree
Showing 25 changed files with 184 additions and 185 deletions.
2 changes: 1 addition & 1 deletion config.yml
Expand Up @@ -50,7 +50,7 @@ params:
current_version: "5.0.0-alpha1"
current_ruby_version: "5.0.0-alpha1"
docs_version: "5.0"
rfs_version: "9.0.2"
rfs_version: "9.0.3"
github_org: "https://github.com/twbs"
repo: "https://github.com/twbs/bootstrap"
twitter: "getbootstrap"
Expand Down
50 changes: 24 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -103,8 +103,8 @@
"clean-css-cli": "^4.3.0",
"cross-env": "^7.0.2",
"eslint": "^7.3.1",
"eslint-config-xo": "^0.31.0",
"eslint-plugin-import": "^2.21.2",
"eslint-config-xo": "^0.32.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-unicorn": "^20.1.0",
"find-unused-sass-variables": "^2.0.0",
"glob": "^7.1.6",
Expand All @@ -128,14 +128,14 @@
"npm-run-all": "^4.1.5",
"popper.js": "^1.16.0",
"postcss-cli": "^7.1.1",
"rollup": "^2.18.0",
"rollup": "^2.18.1",
"rollup-plugin-istanbul": "^2.0.1",
"shelljs": "^0.8.4",
"sirv-cli": "^1.0.1",
"sirv-cli": "^1.0.3",
"stylelint": "^13.6.1",
"stylelint-config-twbs-bootstrap": "^2.0.3",
"terser": "^4.8.0",
"vnu-jar": "20.5.29"
"vnu-jar": "20.6.30"
},
"files": [
"dist/{css,js}/*.{css,js,map}",
Expand Down
24 changes: 12 additions & 12 deletions site/content/docs/5.0/components/carousel.md
Expand Up @@ -239,40 +239,40 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
</thead>
<tbody>
<tr>
<td>interval</td>
<td><code>interval</code></td>
<td>number</td>
<td>5000</td>
<td><code>5000</code></td>
<td>The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.</td>
</tr>
<tr>
<td>keyboard</td>
<td><code>keyboard</code></td>
<td>boolean</td>
<td>true</td>
<td><code>true</code></td>
<td>Whether the carousel should react to keyboard events.</td>
</tr>
<tr>
<td>pause</td>
<td><code>pause</code></td>
<td>string | boolean</td>
<td>"hover"</td>
<td><code>"hover"</code></td>
<td><p>If set to <code>"hover"</code>, pauses the cycling of the carousel on <code>mouseenter</code> and resumes the cycling of the carousel on <code>mouseleave</code>. If set to <code>false</code>, hovering over the carousel won't pause it.</p>
<p>On touch-enabled devices, when set to <code>"hover"</code>, cycling will pause on <code>touchend</code> (once the user finished interacting with the carousel) for two intervals, before automatically resuming. Note that this is in addition to the above mouse behavior.</p></td>
</tr>
<tr>
<td>slide</td>
<td><code>slide</code></td>
<td>string | boolean</td>
<td>false</td>
<td><code>false</code></td>
<td>Autoplays the carousel after the user manually cycles the first item. If "carousel", autoplays the carousel on load.</td>
</tr>
<tr>
<td>wrap</td>
<td><code>wrap</code></td>
<td>boolean</td>
<td>true</td>
<td><code>true</code></td>
<td>Whether the carousel should cycle continuously or have hard stops.</td>
</tr>
<tr>
<td>touch</td>
<td><code>touch</code></td>
<td>boolean</td>
<td>true</td>
<td><code>true</code></td>
<td>Whether the carousel should support left/right swipe interactions on touchscreen devices.</td>
</tr>
</tbody>
Expand Down
16 changes: 8 additions & 8 deletions site/content/docs/5.0/components/collapse.md
Expand Up @@ -171,15 +171,15 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
</thead>
<tbody>
<tr>
<td>parent</td>
<td><code>parent</code></td>
<td>selector | jQuery object | DOM element </td>
<td>false</td>
<td><code>false</code></td>
<td>If parent is provided, then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior - this is dependent on the <code>card</code> class). The attribute has to be set on the target collapsible area.</td>
</tr>
<tr>
<td>toggle</td>
<td><code>toggle</code></td>
<td>boolean</td>
<td>true</td>
<td><code>true</code></td>
<td>Toggles the collapsible element on invocation</td>
</tr>
</tbody>
Expand Down Expand Up @@ -246,19 +246,19 @@ Bootstrap's collapse class exposes a few events for hooking into collapse functi
</thead>
<tbody>
<tr>
<td>show.bs.collapse</td>
<td><code>show.bs.collapse</code></td>
<td>This event fires immediately when the <code>show</code> instance method is called.</td>
</tr>
<tr>
<td>shown.bs.collapse</td>
<td><code>shown.bs.collapse</code></td>
<td>This event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete).</td>
</tr>
<tr>
<td>hide.bs.collapse</td>
<td><code>hide.bs.collapse</code></td>
<td>This event is fired immediately when the <code>hide</code> method has been called.</td>
</tr>
<tr>
<td>hidden.bs.collapse</td>
<td><code>hidden.bs.collapse</code></td>
<td>This event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete).</td>
</tr>
</tbody>
Expand Down
24 changes: 12 additions & 12 deletions site/content/docs/5.0/components/dropdowns.md
Expand Up @@ -822,43 +822,43 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
</thead>
<tbody>
<tr>
<td>offset</td>
<td><code>offset</code></td>
<td>number | string | function</td>
<td>0</td>
<td><code>0</code></td>
<td>
<p>Offset of the dropdown relative to its target.</p>
<p>When a function is used to determine the offset, it is called with an object containing the offset data as its first argument. The function must return an object with the same structure. The triggering element DOM node is passed as the second argument.</p>
<p>For more information refer to Popper.js's <a href="https://popper.js.org/docs/v1/#modifiers..offset.offset">offset docs</a>.</p>
</td>
</tr>
<tr>
<td>flip</td>
<td><code>flip</code></td>
<td>boolean</td>
<td>true</td>
<td><code>true</code></td>
<td>Allow Dropdown to flip in case of an overlapping on the reference element. For more information refer to Popper.js's <a href="https://popper.js.org/docs/v1/#modifiers..flip.enabled">flip docs</a>.</td>
</tr>
<tr>
<td>boundary</td>
<td><code>boundary</code></td>
<td>string | element</td>
<td>'scrollParent'</td>
<td><code>'scrollParent'</code></td>
<td>Overflow constraint boundary of the dropdown menu. Accepts the values of <code>'viewport'</code>, <code>'window'</code>, <code>'scrollParent'</code>, or an HTMLElement reference (JavaScript only). For more information refer to Popper.js's <a href="https://popper.js.org/docs/v1/#modifiers..preventOverflow.boundariesElement">preventOverflow docs</a>.</td>
</tr>
<tr>
<td>reference</td>
<td><code>reference</code></td>
<td>string | element</td>
<td>'toggle'</td>
<td><code>'toggle'</code></td>
<td>Reference element of the dropdown menu. Accepts the values of <code>'toggle'</code>, <code>'parent'</code>, or an HTMLElement reference. For more information refer to Popper.js's <a href="https://popper.js.org/docs/v1/#referenceObject">referenceObject docs</a>.</td>
</tr>
<tr>
<td>display</td>
<td><code>display</code></td>
<td>string</td>
<td>'dynamic'</td>
<td><code>'dynamic'</code></td>
<td>By default, we use Popper.js for dynamic positioning. Disable this with <code>static</code>.</td>
</tr>
<tr>
<td>popperConfig</td>
<td><code>popperConfig</code></td>
<td>null | object</td>
<td>null</td>
<td><code>null</code></td>
<td>To change Bootstrap's default Popper.js config, see <a href="https://popper.js.org/docs/v1/#Popper.Defaults">Popper.js's configuration</a></td>
</tr>
</tbody>
Expand Down
8 changes: 4 additions & 4 deletions site/content/docs/5.0/components/list-group.md
Expand Up @@ -445,19 +445,19 @@ If no tab was already active, the `hide.bs.tab` and `hidden.bs.tab` events will
</thead>
<tbody>
<tr>
<td>show.bs.tab</td>
<td><code>show.bs.tab</code></td>
<td>This event fires on tab show, but before the new tab has been shown. Use <code>event.target</code> and <code>event.relatedTarget</code> to target the active tab and the previous active tab (if available) respectively.</td>
</tr>
<tr>
<td>shown.bs.tab</td>
<td><code>shown.bs.tab</code></td>
<td>This event fires on tab show after a tab has been shown. Use <code>event.target</code> and <code>event.relatedTarget</code> to target the active tab and the previous active tab (if available) respectively.</td>
</tr>
<tr>
<td>hide.bs.tab</td>
<td><code>hide.bs.tab</code></td>
<td>This event fires when a new tab is to be shown (and thus the previous active tab is to be hidden). Use <code>event.target</code> and <code>event.relatedTarget</code> to target the current active tab and the new soon-to-be-active tab, respectively.</td>
</tr>
<tr>
<td>hidden.bs.tab</td>
<td><code>hidden.bs.tab</code></td>
<td>This event fires after a new tab is shown (and thus the previous active tab is hidden). Use <code>event.target</code> and <code>event.relatedTarget</code> to target the previous active tab and the new active tab, respectively.</td>
</tr>
</tbody>
Expand Down

0 comments on commit 463ee9e

Please sign in to comment.