Commit 552b87c
committed
Merge branch 'dev' of https://github.com/coreui/coreui into dev
# 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
# package-lock.json
# 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
# scss/sidebar/_sidebar.scssFile tree
33 files changed
+1312
-1671
lines changed- dist
- css
- js
- docs/layouts
- _default
- partials
- js/src
- scss/sidebar
33 files changed
+1312
-1671
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
47 | | - | |
| 46 | + | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| |||
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