Skip to content

Commit 6c2ccd4

Browse files
committed
Merge branch 'main' of https://github.com/coreui/coreui
# Conflicts: # README.md # composer.json # config.yml # dist/css/coreui-grid.css # dist/css/coreui-grid.css.map # dist/css/coreui-grid.min.css # dist/css/coreui-grid.min.css.map # dist/css/coreui-grid.rtl.css # dist/css/coreui-grid.rtl.css.map # dist/css/coreui-grid.rtl.min.css # dist/css/coreui-grid.rtl.min.css.map # dist/css/coreui-reboot.css # dist/css/coreui-reboot.css.map # dist/css/coreui-reboot.min.css # dist/css/coreui-reboot.min.css.map # dist/css/coreui-reboot.rtl.css # dist/css/coreui-reboot.rtl.css.map # dist/css/coreui-reboot.rtl.min.css # dist/css/coreui-reboot.rtl.min.css.map # dist/css/coreui-utilities.css # dist/css/coreui-utilities.css.map # dist/css/coreui-utilities.min.css # dist/css/coreui-utilities.min.css.map # dist/css/coreui-utilities.rtl.css # dist/css/coreui-utilities.rtl.css.map # dist/css/coreui-utilities.rtl.min.css # dist/css/coreui-utilities.rtl.min.css.map # dist/css/coreui.css # dist/css/coreui.css.map # dist/css/coreui.min.css # dist/css/coreui.min.css.map # dist/css/coreui.rtl.css # dist/css/coreui.rtl.css.map # dist/css/coreui.rtl.min.css # dist/css/coreui.rtl.min.css.map # dist/js/coreui.bundle.js # dist/js/coreui.bundle.js.map # dist/js/coreui.bundle.min.js # dist/js/coreui.bundle.min.js.map # dist/js/coreui.esm.js # dist/js/coreui.esm.js.map # dist/js/coreui.esm.min.js # dist/js/coreui.esm.min.js.map # dist/js/coreui.js # dist/js/coreui.js.map # dist/js/coreui.min.js # dist/js/coreui.min.js.map # docs/layouts/partials/js-data-attributes.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/navigation.js # js/dist/navigation.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/sidebar.js # js/dist/sidebar.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/dist/util/backdrop.js # js/dist/util/component-functions.js # js/dist/util/config.js # js/dist/util/focustrap.js # js/dist/util/index.js # js/dist/util/index.js.map # js/dist/util/sanitizer.js # js/dist/util/sanitizer.js.map # js/dist/util/scrollbar.js # js/dist/util/swipe.js # js/dist/util/template-factory.js # 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/navigation.js # js/src/offcanvas.js # js/src/popover.js # js/src/scrollspy.js # js/src/sidebar.js # js/src/tab.js # js/src/toast.js # js/src/tooltip.js # js/src/util/index.js # js/src/util/sanitizer.js # package-lock.json # package.js # package.json # scss/coreui-grid.rtl.scss # scss/coreui-grid.scss # scss/coreui-reboot.rtl.scss # scss/coreui-reboot.scss # scss/coreui-utilities.rtl.scss # scss/coreui-utilities.scss # scss/coreui.rtl.scss # scss/coreui.scss
2 parents 5dc2dc2 + 8dcaba1 commit 6c2ccd4

Some content is hidden

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

74 files changed

+419
-74
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion

README.md

Lines changed: 1 addition & 1 deletion

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.

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.

0 commit comments

Comments
 (0)