Skip to content

Commit

Permalink
Merge branch 'main' into master-xmr-pa11y-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickhlauke authored Sep 7, 2021
2 parents 9585e8f + b6855ae commit 00b5da3
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 21 deletions.
6 changes: 5 additions & 1 deletion build/vnu-jar.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ execFile('java', ['-version'], (error, stdout, stderr) => {
// "autocomplete" is included in <button> and checkboxes and radio <input>s due to
// Firefox's non-standard autocomplete behavior - see https://bugzilla.mozilla.org/show_bug.cgi?id=654072
'Attribute “autocomplete” is only allowed when the input type is.*',
'Attribute “autocomplete” not allowed on element “button” at this point.'
'Attribute “autocomplete” not allowed on element “button” at this point.',
// Per https://www.w3.org/TR/html-aria/#docconformance having "aria-disabled" on a link is
// NOT RECOMMENDED, but it's still valid - we explain in the docs that it's not ideal,
// and offer more robust alternatives, but also need to show a less-than-ideal example
'An “aria-disabled” attribute whose value is “true” should not be specified on an “a” element that has an “href” attribute.'
].join('|')

const args = [
Expand Down
2 changes: 1 addition & 1 deletion js/tests/unit/util/focustrap.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('FocusTrap', () => {
document.dispatchEvent(focusInEvent)
})

it('should wrap focus around foward on tab', done => {
it('should wrap focus around forward on tab', done => {
fixtureEl.innerHTML = [
'<a href="#" id="outside">outside</a>',
'<div id="focustrap" tabindex="-1">',
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"stylelint": "^13.13.1",
"stylelint-config-twbs-bootstrap": "^2.2.3",
"terser": "5.1.0",
"vnu-jar": "21.6.11"
"vnu-jar": "21.9.2"
},
"files": [
"dist/{css,js}/*.{css,js,map}",
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/alerts.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ See the [triggers](#triggers) section for more details.
<code>getOrCreateInstance</code>
</td>
<td>
Static method which returns an alert instance associated to a DOM element or create a new one in case it wasn't initialised.
Static method which returns an alert instance associated to a DOM element or create a new one in case it wasn't initialized.
You can use it like this: <code>bootstrap.Alert.getOrCreateInstance(element)</code>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/buttons.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ var bsButton = new bootstrap.Button(button)
<code>getOrCreateInstance</code>
</td>
<td>
Static method which returns a button instance associated to a DOM element or create a new one in case it wasn't initialised.
Static method which returns a button instance associated to a DOM element or create a new one in case it wasn't initialized.
You can use it like this: <code>bootstrap.Button.getOrCreateInstance(element)</code>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/carousel.md
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ var carousel = new bootstrap.Carousel(myCarousel, {
<code>getOrCreateInstance</code>
</td>
<td>
Static method which returns a carousel instance associated to a DOM element or create a new one in case it wasn't initialised.
Static method which returns a carousel instance associated to a DOM element or create a new one in case it wasn't initialized.
You can use it like this: <code>bootstrap.Carousel.getOrCreateInstance(element)</code>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/collapse.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ var bsCollapse = new bootstrap.Collapse(myCollapse, {
<code>getOrCreateInstance</code>
</td>
<td>
Static method which returns a collapse instance associated to a DOM element or create a new one in case it wasn't initialised.
Static method which returns a collapse instance associated to a DOM element or create a new one in case it wasn't initialized.
You can use it like this: <code>bootstrap.Collapse.getOrCreateInstance(element)</code>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/dropdowns.md
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ var dropdown = new bootstrap.Dropdown(element, {
<code>getOrCreateInstance</code>
</td>
<td>
Static method which returns a dropdown instance associated to a DOM element or create a new one in case it wasn't initialised.
Static method which returns a dropdown instance associated to a DOM element or create a new one in case it wasn't initialized.
You can use it like this: <code>bootstrap.Dropdown.getOrCreateInstance(element)</code>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/list-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ var tab = bootstrap.Tab.getInstance(triggerEl) // Returns a Bootstrap tab instan

#### getOrCreateInstance

*Static* method which allows you to get the tab instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the tab instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var triggerEl = document.querySelector('#trigger')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/modal.md
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ var modal = bootstrap.Modal.getInstance(myModalEl) // Returns a Bootstrap modal

#### getOrCreateInstance

*Static* method which allows you to get the modal instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the modal instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var myModalEl = document.querySelector('#myModal')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/navs-tabs.md
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ var tab = bootstrap.Tab.getInstance(triggerEl) // Returns a Bootstrap tab instan

#### getOrCreateInstance

*Static* method which allows you to get the tab instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the tab instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var triggerEl = document.querySelector('#trigger')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/offcanvas.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ var bsOffcanvas = new bootstrap.Offcanvas(myOffcanvas)
| `show` | Shows an offcanvas element. **Returns to the caller before the offcanvas element has actually been shown** (i.e. before the `shown.bs.offcanvas` event occurs).|
| `hide` | Hides an offcanvas element. **Returns to the caller before the offcanvas element has actually been hidden** (i.e. before the `hidden.bs.offcanvas` event occurs).|
| `getInstance` | *Static* method which allows you to get the offcanvas instance associated with a DOM element |
| `getOrCreateInstance` | *Static* method which allows you to get the offcanvas instance associated with a DOM element, or create a new one in case it wasn't initialised |
| `getOrCreateInstance` | *Static* method which allows you to get the offcanvas instance associated with a DOM element, or create a new one in case it wasn't initialized |
{{< /bs-table >}}

### Events
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/placeholders.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ We apply additional styling to `.btn`s via `::before` to ensure the `height` is
{{< /example >}}

{{< callout info >}}
The use of `aria-hidden="true"` only indicates that the element should be hidden to screen readers. The *loading* behaviour of the placeholder depends on how authors will actually use the placeholder styles, how they plan to update things, etc. Some JavasSript code may be needed to *swap* the state of the placeholder and inform AT users of the update.
The use of `aria-hidden="true"` only indicates that the element should be hidden to screen readers. The *loading* behavior of the placeholder depends on how authors will actually use the placeholder styles, how they plan to update things, etc. Some JavasSript code may be needed to *swap* the state of the placeholder and inform AT users of the update.
{{< /callout >}}

### Width
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/popovers.md
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ var popover = bootstrap.Popover.getInstance(exampleTriggerEl) // Returns a Boots

#### getOrCreateInstance

*Static* method which allows you to get the popover instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the popover instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var exampleTriggerEl = document.getElementById('example')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/scrollspy.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ var scrollSpy = bootstrap.ScrollSpy.getInstance(scrollSpyContentEl) // Returns a

#### getOrCreateInstance

*Static* method which allows you to get the scrollspy instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the scrollspy instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var scrollSpyContentEl = document.getElementById('content')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/toasts.md
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ var myToast = bootstrap.Toast.getInstance(myToastEl) // Returns a Bootstrap toas

#### getOrCreateInstance

*Static* method which allows you to get the toast instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the toast instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var myToastEl = document.getElementById('myToastEl')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/components/tooltips.md
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ var tooltip = bootstrap.Tooltip.getInstance(exampleTriggerEl) // Returns a Boots

#### getOrCreateInstance

*Static* method which allows you to get the tooltip instance associated with a DOM element, or create a new one in case it wasn't initialised
*Static* method which allows you to get the tooltip instance associated with a DOM element, or create a new one in case it wasn't initialized

```js
var exampleTriggerEl = document.getElementById('example')
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.1/examples/blog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3>Example lists</h3>
<li>Second list item with a longer description</li>
<li>Third list item to close it out</li>
</ol>
<p>And this is a definiton list:</p>
<p>And this is a definition list:</p>
<dl>
<dt>HyperText Markup Language (HTML)</dt>
<dd>The language used to describe and define the content of a Web page</dd>
Expand Down

0 comments on commit 00b5da3

Please sign in to comment.