Commit 82b45be
committed
Merge branch 'v4-next' of https://github.com/coreui/coreui into v4-next
# Conflicts:
# README.md
# 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
# 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/src/base-component.js
# package-lock.json
# package.js
# package.jsonFile tree
137 files changed
+20700
-14447
lines changed- _old/themes
- dark
- build
- dist
- css
- themes
- js
- docs/assets/scss
- js/dist
- dom
- util
- scss/mixins
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
137 files changed
+20700
-14447
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | 5 | | |
| 6 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments