Skip to content

Commit 82b45be

Browse files
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.json
2 parents 238c0ac + 6948ddb commit 82b45be

File tree

137 files changed

+20700
-14447
lines changed

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

.stylelintignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
**/dist/
33
**/vendor/
44
/_gh_pages/
5-
/js/coverage/
6-
/docs/assets/scss/_ads.scss
75
/docs/assets/css/all-icons.css
6+
/js/coverage/

.stylelintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
}
4343
},
4444
{
45-
"files": "site/**/*.scss",
45+
"files": "docs/**/*.scss",
4646
"rules": {
4747
"scss/dollar-variable-default": null
4848
}
4949
},
5050
{
51-
"files": "site/**/examples/**/*.css",
51+
"files": "docs/**/examples/**/*.css",
5252
"rules": {
5353
"comment-empty-line-before": null,
5454
"property-no-vendor-prefix": null,

CHANGELOG.md

Lines changed: 0 additions & 117 deletions
This file was deleted.

_old/themes/dark.scss

Lines changed: 0 additions & 67 deletions
This file was deleted.

_old/themes/dark/_root.scss

Lines changed: 0 additions & 19 deletions
This file was deleted.

_old/themes/dark/_utilities.scss

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)