Commit 2545c24
committed
Merge branch 'main' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts:
# .github/workflows-turnoff/browserstack.yml
# 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/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/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.scssFile tree
39 files changed
+55
-252
lines changed- .github
- workflows-turnoff
- build
- dist/css
- docs
- content/4.0
- components
- customize
- getting-started
- data
- layouts/_default
- js/tests
- integration
- visual
- nuget
- scss
39 files changed
+55
-252
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
126 | | - | |
| 126 | + | |
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
| |||
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
145 | | - | |
| 145 | + | |
146 | 146 | | |
147 | | - | |
| 147 | + | |
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| |||
180 | 180 | | |
181 | 181 | | |
182 | 182 | | |
183 | | - | |
| 183 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
0 commit comments