Skip to content

Commit 8317198

Browse files
committed
Merge branch 'main' of https://github.com/coreui/coreui
# Conflicts: # docs/content/layout/css-grid.md # docs/layouts/partials/js-data-attributes.md
2 parents 0ed9855 + 2872856 commit 8317198

33 files changed

+55
-55
lines changed

docs/content/components/alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ alert.close()
216216

217217
### Events
218218

219-
Bootstrap's alert plugin exposes a few events for hooking into alert functionality.
219+
CoreUI for Bootstrap's alert plugin exposes a few events for hooking into alert functionality.
220220

221221
{{< bs-table >}}
222222
| Event | Description |

docs/content/components/badge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You can also replace the `.badge` class with a few more utilities without a coun
6868

6969
## Contextual variations
7070

71-
Add any of the below-mentioned classes to modify the presentation of a badge. Please note that when using Bootstrap's default `.bg-light`, you'll likely need a text color utility like `.text-dark` for proper styling. This is because background utilities do not set anything but `background-color`.
71+
Add any of the below-mentioned classes to modify the presentation of a badge. Please note that when using CoreUI for Bootstrap's default `.bg-light`, you'll likely need a text color utility like `.text-dark` for proper styling. This is because background utilities do not set anything but `background-color`.
7272

7373
{{< example >}}
7474
{{< badge.inline >}}

docs/content/components/card.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ You can instantly change the text arrangement of any card—in its whole or spec
303303

304304
## Navigation
305305

306-
Add some navigation to a card's header (or block) with Bootstrap's [nav components]({{< docsref "/components/navs-tabs" >}}).
306+
Add some navigation to a card's header (or block) with CoreUI for Bootstrap's [nav components]({{< docsref "/components/navs-tabs" >}}).
307307

308308
{{< example >}}
309309
<div class="card text-center">

docs/content/components/carousel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ const carousel = new coreui.Carousel(myCarouselElement, {
353353

354354
### Events
355355

356-
Bootstrap's carousel class exposes two events for hooking into carousel functionality. Both events have the following additional properties:
356+
CoreUI for Bootstrap's carousel class exposes two events for hooking into carousel functionality. Both events have the following additional properties:
357357

358358
- `direction`: The direction in which the carousel is sliding (either `"left"` or `"right"`).
359359
- `relatedTarget`: The DOM element that is being slid into place as the active item.

docs/content/components/collapse.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Be sure to add `aria-expanded` to the control component. This attribute explicit
104104

105105
If your control element is targeting a single collapsible element – i.e., the `data-coreui-target` attribute is pointing to an `id` selector – you should attach the `aria-controls` attribute to the control part, including the `id` of the collapsible element. Modern screen readers and related assistive technologies address this attribute to provide users with extra shortcuts to navigate directly to the collapsible element itself.
106106

107-
Note that Bootstrap's current implementation does not cover the various *optional* keyboard interactions described in the [WAI-ARIA Authoring Practices 1.1 accordion pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#accordion) - you will need to include these yourself with custom JavaScript.
107+
Note that CoreUI for Bootstrap's current implementation does not cover the various *optional* keyboard interactions described in the [WAI-ARIA Authoring Practices 1.1 accordion pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#accordion) - you will need to include these yourself with custom JavaScript.
108108
## Usage
109109

110110
The collapse plugin utilizes a few classes to handle the heavy lifting:
@@ -172,7 +172,7 @@ const bsCollapse = new coreui.Collapse('#myCollapse', {
172172

173173
### Events
174174

175-
Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
175+
CoreUI for Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
176176

177177
{{< bs-table >}}
178178
| Event type | Description |

docs/content/components/dropdowns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Dropdowns are built on a third party library, [Popper.js](https://popper.js.org/
2222

2323
The [<abbr title="Web Accessibility Initiative">WAI</abbr> <abbr title="Accessible Rich Internet Applications">ARIA</abbr>](https://www.w3.org/TR/wai-aria/) standard defines an actual [`role="menu"` widget](https://www.w3.org/TR/wai-aria/#menu), but this is specific to application-like menus which trigger actions or functions. <abbr title="Accessible Rich Internet Applications">ARIA</abbr> menus can only contain menu items, checkbox menu items, radio button menu items, radio button groups, and sub-menus.
2424

25-
Bootstrap's dropdowns, on the other hand, are designed to be generic and applicable to a variety of situations and markup structures. For instance, it is possible to create dropdowns that contain additional inputs and form controls, such as search fields or login forms. For this reason, Bootstrap does not expect (nor automatically add) any of the `role` and `aria-` attributes required for true <abbr title="Accessible Rich Internet Applications">ARIA</abbr> menus. Authors will have to include these more specific attributes themselves.
25+
CoreUI for Bootstrap's dropdowns, on the other hand, are designed to be generic and applicable to a variety of situations and markup structures. For instance, it is possible to create dropdowns that contain additional inputs and form controls, such as search fields or login forms. For this reason, Bootstrap does not expect (nor automatically add) any of the `role` and `aria-` attributes required for true <abbr title="Accessible Rich Internet Applications">ARIA</abbr> menus. Authors will have to include these more specific attributes themselves.
2626

2727
However, Bootstrap does add built-in support for most standard keyboard menu interactions, such as the ability to move through individual `.dropdown-item` elements using the cursor keys and close the menu with the <kbd>ESC</kbd> key.
2828

@@ -1043,7 +1043,7 @@ Regardless of whether you call your dropdown via JavaScript or instead use the d
10431043
| `boundary` | string, element | `'scrollParent'` | Overflow constraint boundary of the dropdown menu (applies only to Popper's preventOverflow modifier). By default it's `clippingParents` and can accept an HTMLElement reference (via JavaScript only). For more information refer to Popper's [detectOverflow docs](https://popper.js.org/docs/v2/utils/detect-overflow/#boundary). |
10441044
| `display` | string | `'dynamic'` | By default, we use Popper for dynamic positioning. Disable this with `static`. |
10451045
| `offset` | number, string, function | `[0, 2]` | Offset of the dropdown relative to its target. You can pass a string in data attributes with comma separated values like: `data-coreui-offset="10,20"`. When a function is used to determine the offset, it is called with an object containing the popper placement, the reference, and popper rects as its first argument. The triggering element DOM node is passed as the second argument. The function must return an array with two numbers: [skidding](https://popper.js.org/docs/v2/modifiers/offset/#skidding-1), [distance](https://popper.js.org/docs/v2/modifiers/offset/#distance-1). For more information refer to Popper's [offset docs](https://popper.js.org/docs/v2/modifiers/offset/#options). |
1046-
| `popperConfig` | null, object, function | `null` | To change Bootstrap's default Popper config, see [Popper's configuration](https://popper.js.org/docs/v2/constructors/#options). When a function is used to create the Popper configuration, it's called with an object that contains the Bootstrap's default Popper configuration. It helps you use and merge the default with your own configuration. The function must return a configuration object for Popper. |
1046+
| `popperConfig` | null, object, function | `null` | To change CoreUI for Bootstrap's default Popper config, see [Popper's configuration](https://popper.js.org/docs/v2/constructors/#options). When a function is used to create the Popper configuration, it's called with an object that contains the CoreUI for Bootstrap's default Popper configuration. It helps you use and merge the default with your own configuration. The function must return a configuration object for Popper. |
10471047
| `reference` | string, element | `'toggle'` | Reference element of the dropdown menu. Accepts the values of `'toggle'`, `'parent'`, an HTMLElement reference or an object providing `getBoundingClientRect`. For more information refer to Popper's [constructor docs](https://popper.js.org/docs/v2/constructors/#createpopper) and [virtual element docs](https://popper.js.org/docs/v2/virtual-elements/). |
10481048
{{< /bs-table >}}
10491049

docs/content/components/list-group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ Add nearly any HTML within, even for linked list groups like the one below, with
248248

249249
## Checkboxes and radios
250250

251-
Place Bootstrap's checkboxes and radios within list group items and customize as needed. You can use them without `<label>`s, but please remember to include an `aria-label` attribute and value for accessibility.
251+
Place CoreUI for Bootstrap's checkboxes and radios within list group items and customize as needed. You can use them without `<label>`s, but please remember to include an `aria-label` attribute and value for accessibility.
252252

253253
{{< example >}}
254254
<ul class="list-group">

docs/content/components/modal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bootstrap: true
1313

1414
## How it works
1515

16-
Bootstrap modals are lightweight and multi-purpose popups. Modals are split into three primary sections: header, body, and footer. Each has its role and so should be used accordingly. Before getting started with Bootstrap's modal component, be sure to read the following as our menu options have recently changed.
16+
Bootstrap modals are lightweight and multi-purpose popups. Modals are split into three primary sections: header, body, and footer. Each has its role and so should be used accordingly. Before getting started with CoreUI for Bootstrap's modal component, be sure to read the following as our menu options have recently changed.
1717

1818
- Modals are built with HTML, CSS, and JavaScript. They're positioned over everything else in the document and remove scroll from the `<body>` so that modal content scrolls instead.
1919
- Clicking on the modal "backdrop" will automatically close the modal.
@@ -847,7 +847,7 @@ const myModal = new coreui.Modal('#myModal', {
847847

848848
### Events
849849

850-
Bootstrap's modal class exposes a few events for hooking into modal functionality. All modal events are fired at the modal itself (i.e. at the `<div class="modal">`).
850+
CoreUI for Bootstrap's modal class exposes a few events for hooking into modal functionality. All modal events are fired at the modal itself (i.e. at the `<div class="modal">`).
851851

852852
{{< bs-table >}}
853853
| Event | Description |

docs/content/components/navbar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: docs
33
title: Bootstrap navbar
4-
description: Documentation and examples for Bootstrap's powerful, responsive navigation header, the navbar. Includes support for branding, navigation, and more, including support for our collapse plugin.
4+
description: Documentation and examples for CoreUI for Bootstrap's powerful, responsive navigation header, the navbar. Includes support for branding, navigation, and more, including support for our collapse plugin.
55
group: components
66
aliases:
77
- "/4.0/components/navbar/"
@@ -328,7 +328,7 @@ Mix and match with other components and utilities as needed.
328328
**New in v4.2.0:** CSS variables are applied to `.navbar`, defaulting to the "light" appearance, and can be overridden with `.navbar-dark`.
329329
{{< /callout >}}
330330

331-
Navbar themes are easier than ever thanks to Bootstrap's combination of Sass and CSS variables. The default is our "light navbar" for use with light background colors, but you can also apply `.navbar-dark` for dark background colors. Then, customize with `.bg-*` utilities.
331+
Navbar themes are easier than ever thanks to CoreUI for Bootstrap's combination of Sass and CSS variables. The default is our "light navbar" for use with light background colors, but you can also apply `.navbar-dark` for dark background colors. Then, customize with `.bg-*` utilities.
332332

333333
<div class="docs-example">
334334
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">

docs/content/components/navs-tabs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: docs
33
title: Bootstrap navs and tabs
4-
description: Documentation and examples for how to use Bootstrap's included navigation components.
4+
description: Documentation and examples for how to use CoreUI for Bootstrap's included navigation components.
55
group: components
66
aliases: "/4.1/components/navs/"
77
aliases:

0 commit comments

Comments
 (0)