Commit b3ee17d
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts:
# 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.map
# dist/js/coreui.bundle.min.js
# dist/js/coreui.bundle.min.js.map
# dist/js/coreui.esm.js.map
# dist/js/coreui.esm.min.js
# dist/js/coreui.esm.min.js.map
# dist/js/coreui.js.map
# dist/js/coreui.min.js
# dist/js/coreui.min.js.map
# package-lock.json
# scss/_variables.scss
# 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
97 files changed
+561
-481
lines changed- dist
- css
- themes
- js
- docs/content/4.0
- js
- dist
- dom
- src
- dom
- util
- scss
- sidebar
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
97 files changed
+561
-481
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
50 | | - | |
| 49 | + | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | | - | |
| 61 | + | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
74 | 74 | | |
75 | | - | |
| 75 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments