Skip to content

Commit d967cf8

Browse files
committed
Merge branch 'main' of https://github.com/coreui/bootstrap into v4-dev-sync
# Conflicts: # .bundlewatch.config.json # README.md # config.yml # dist/css/bootstrap-grid.css.map # dist/css/bootstrap-grid.rtl.css.map # dist/css/bootstrap-reboot.css.map # dist/css/bootstrap-reboot.rtl.css.map # dist/css/bootstrap-utilities.css.map # dist/css/bootstrap-utilities.rtl.css.map # dist/css/bootstrap.css # dist/css/bootstrap.css.map # dist/css/bootstrap.min.css # dist/css/bootstrap.min.css.map # dist/css/bootstrap.rtl.css # dist/css/bootstrap.rtl.css.map # dist/css/bootstrap.rtl.min.css # dist/css/bootstrap.rtl.min.css.map # dist/js/bootstrap.bundle.js.map # dist/js/bootstrap.bundle.min.js # dist/js/bootstrap.bundle.min.js.map # dist/js/bootstrap.esm.js.map # dist/js/bootstrap.esm.min.js # dist/js/bootstrap.esm.min.js.map # dist/js/bootstrap.js.map # dist/js/bootstrap.min.js # dist/js/bootstrap.min.js.map # dist/js/coreui.bundle.js # dist/js/coreui.esm.js # dist/js/coreui.js # docs/content/4.0/components/toasts.md # docs/content/4.0/components/tooltips.md # docs/content/4.0/getting-started/introduction.md # docs/content/4.0/migration.md # js/dist/alert.js # js/dist/alert.js.map # js/dist/base-component.js # js/dist/base-component.js.map # js/dist/button.js # js/dist/button.js.map # js/dist/carousel.js # js/dist/carousel.js.map # js/dist/collapse.js # js/dist/collapse.js.map # js/dist/dom/data.js # js/dist/dom/data.js.map # js/dist/dom/event-handler.js # js/dist/dom/event-handler.js.map # js/dist/dom/manipulator.js # js/dist/dom/manipulator.js.map # js/dist/dom/selector-engine.js # js/dist/dom/selector-engine.js.map # js/dist/dropdown.js # js/dist/dropdown.js.map # js/dist/modal.js # js/dist/modal.js.map # js/dist/offcanvas.js # js/dist/offcanvas.js.map # js/dist/popover.js # js/dist/popover.js.map # js/dist/scrollspy.js # js/dist/scrollspy.js.map # js/dist/tab.js # js/dist/tab.js.map # js/dist/toast.js # js/dist/toast.js.map # js/dist/tooltip.js # js/dist/tooltip.js.map # js/index.esm.js # js/index.umd.js # js/src/alert.js # js/src/base-component.js # js/src/button.js # js/src/carousel.js # js/src/collapse.js # js/src/dom/data.js # js/src/dom/event-handler.js # js/src/dom/manipulator.js # js/src/dom/selector-engine.js # js/src/dropdown.js # js/src/modal.js # js/src/offcanvas.js # js/src/popover.js # js/src/scrollspy.js # js/src/tab.js # js/src/toast.js # js/src/tooltip.js # js/src/util/index.js # js/src/util/sanitizer.js # js/tests/unit/dropdown.spec.js # js/tests/unit/modal.spec.js # js/tests/unit/offcanvas.spec.js # js/tests/unit/popover.spec.js # js/tests/unit/tooltip.spec.js # js/tests/unit/util/scrollbar.spec.js # package-lock.json # package.json # scss/_tables.scss # site/content/docs/5.0/about/overview.md # site/content/docs/5.0/examples/cheatsheet/cheatsheet.js # site/content/docs/5.0/examples/dashboard-rtl/dashboard.js # site/content/docs/5.0/examples/dashboard-rtl/index.html # site/content/docs/5.0/examples/dashboard/dashboard.css # site/content/docs/5.0/examples/dashboard/dashboard.js # site/content/docs/5.0/examples/dashboard/dashboard.rtl.css # site/content/docs/5.0/examples/dashboard/index.html # site/content/docs/5.0/examples/heroes/index.html # site/content/docs/5.0/examples/offcanvas-navbar/index.html # site/content/docs/5.0/examples/offcanvas-navbar/offcanvas.js # site/content/docs/5.0/examples/sidebars/index.html # site/content/docs/5.0/examples/sidebars/sidebars.css # site/content/docs/5.0/getting-started/rtl.md
2 parents 8ca516b + 9d3af8e commit d967cf8

File tree

112 files changed

+4213
-3712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4213
-3712
lines changed

.github/release-drafter.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ categories:
1717
- 'fix'
1818
- 'bugfix'
1919
- 'bug'
20-
- title: '⚡ Performance Improvements'
20+
- title: '⚡ Performance improvements'
2121
labels:
2222
- 'performance'
2323
- title: '🎨 CSS'
@@ -29,6 +29,9 @@ categories:
2929
- title: '📖 Docs'
3030
labels:
3131
- 'docs'
32+
- title: '🛠 Examples'
33+
labels:
34+
- 'examples'
3235
- title: '🌎 Accessibility'
3336
labels:
3437
- 'accessibility'

.github/workflows/js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
node: [10, 12, 14, 16]
20+
node: [12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository

build/build-plugins.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ const defaultPluginConfig = {
5858
}
5959
}
6060

61+
// eslint-disable-next-line complexity
6162
const getConfigByPluginKey = pluginKey => {
6263
if (
6364
pluginKey === 'Data' ||

dist/css/coreui-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-grid.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-grid.rtl.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-reboot.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-reboot.rtl.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-utilities.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)