Skip to content

Commit c25f30e

Browse files
committed
Merge branch 'main' of https://github.com/coreui/bootstrap into v4-dev-sync
# Conflicts: # .bundlewatch.config.json # .eslintrc.json # README.md # config.yml # dist/css/bootstrap-grid.css.map # dist/css/bootstrap-grid.min.css.map # dist/css/bootstrap-grid.rtl.css.map # dist/css/bootstrap-grid.rtl.min.css.map # dist/css/bootstrap-reboot.css.map # dist/css/bootstrap-reboot.min.css.map # dist/css/bootstrap-reboot.rtl.css.map # dist/css/bootstrap-reboot.rtl.min.css.map # dist/css/bootstrap-utilities.css.map # dist/css/bootstrap-utilities.min.css.map # dist/css/bootstrap-utilities.rtl.css.map # dist/css/bootstrap-utilities.rtl.min.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/css/coreui-dark-theme.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/assets/scss/_footer.scss # docs/content/4.0/components/dropdowns.md # docs/content/4.0/components/list-group.md # docs/content/4.0/components/modal.md # docs/content/4.0/components/offcanvas.md # docs/content/4.0/components/popovers.md # docs/content/4.0/components/scrollspy.md # docs/content/4.0/components/toasts.md # docs/content/4.0/components/tooltips.md # docs/content/4.0/forms/form-control.md # docs/content/4.0/getting-started/parcel.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/tab.spec.js # package-lock.json # package.json # scss/_accordion.scss # scss/_buttons.scss # scss/_dropdown.scss # scss/_offcanvas.scss # scss/mixins/_alert.scss # scss/mixins/_forms.scss # scss/mixins/_list-group.scss # site/content/docs/5.0/examples/album-rtl/index.html # site/content/docs/5.0/examples/blog-rtl/index.html # site/content/docs/5.0/examples/blog/index.html # site/content/docs/5.0/examples/carousel-rtl/index.html # site/content/docs/5.0/examples/cheatsheet-rtl/index.html # site/content/docs/5.0/examples/cheatsheet/index.html # site/content/docs/5.0/examples/checkout-rtl/index.html # 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/features/index.html # site/content/docs/5.0/examples/headers/index.html # site/content/docs/5.0/examples/heroes/index.html # site/content/docs/5.0/examples/pricing/index.html # site/content/docs/5.0/examples/sidebars/index.html # site/content/docs/5.0/examples/sidebars/sidebars.css # site/content/docs/5.0/examples/starter-template/index.html # site/content/docs/5.0/getting-started/accessibility.md # site/content/docs/5.0/getting-started/download.md # site/content/docs/5.0/getting-started/rtl.md # site/layouts/partials/footer.html
2 parents 19a4ac6 + 4ddde69 commit c25f30e

File tree

132 files changed

+5256
-2933
lines changed

Some content is hidden

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

132 files changed

+5256
-2933
lines changed

.eslintrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"plugin:import/errors",
55
"plugin:import/warnings",
66
"plugin:unicorn/recommended",
7+
"xo",
78
"xo/browser"
89
],
910
"rules": {
@@ -50,6 +51,7 @@
5051
"unicorn/prefer-dom-node-append": "off",
5152
"unicorn/prefer-dom-node-dataset": "off",
5253
"unicorn/prefer-dom-node-remove": "off",
54+
"unicorn/prefer-module": "off",
5355
"unicorn/prefer-query-selector": "off",
5456
"unicorn/prefer-spread": "off",
5557
"unicorn/prevent-abbreviations": "off"

.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]
20+
node: [10, 12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository

build/build-plugins.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ const getConfigByPluginKey = pluginKey => {
6565
pluginKey === 'EventHandler' ||
6666
pluginKey === 'SelectorEngine' ||
6767
pluginKey === 'Util' ||
68-
pluginKey === 'Sanitizer'
68+
pluginKey === 'Sanitizer' ||
69+
pluginKey === 'Backdrop'
6970
) {
7071
return {
7172
external: []
@@ -133,7 +134,8 @@ const getConfigByPluginKey = pluginKey => {
133134

134135
const utilObjects = new Set([
135136
'Util',
136-
'Sanitizer'
137+
'Sanitizer',
138+
'Backdrop'
137139
])
138140

139141
const domObjects = new Set([

config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ params:
4646
authors: "Lukasz Holeczek, Andrzej Kopanski"
4747
social_image_path: /4.0/assets/brand/coreui-social.jpg
4848
social_logo_path: /4.0/assets/brand/coreui-social-logo.png
49+
4950
current_version: "4.0.0-beta.0"
5051
current_ruby_version: "4.0.0-beta.0"
5152
docs_version: "4.0"
@@ -71,5 +72,5 @@ params:
7172
js_hash: "sha384-r9UuCGxKqS76V4DsQtwbCKmJoREyVX9UYgGcLStRK+ZTrMXjpKS5IwmCCi9FzHJZ"
7273
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.0.0-beta.0/dist/js/coreui.bundle.min.js"
7374
js_bundle_hash: "sha384-EEvn1uBLu9/DmDUYGfy+tzxC7/24HZV4R9jRi+06LYWkC1fQaSzukAR8b2rAz+nb"
74-
popper: "https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.0/dist/umd/popper.min.js"
75+
popper: "https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js"
7576
popper_hash: "sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p"

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.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-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.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.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.

dist/css/coreui-utilities.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.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-utilities.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.css

Lines changed: 61 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui.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.min.css

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.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.

0 commit comments

Comments
 (0)