Skip to content

Commit a0f13d2

Browse files
committed
Merge branch 'bs-v5.2.0-beta1' of https://github.com/coreui/coreui into merge-bs-v5.2.0-beta1
# Conflicts: # README.md # config.yml # dist/css/bootstrap-reboot.css.map # 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 # docs/content/getting-started/webpack.md # 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/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.scss
2 parents dce048c + 1e9e19f commit a0f13d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+976
-823
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## [v4.1.6](https://github.com/coreui/coreui/compare/v4.1.5...v4.1.6)
3+
## [v4.2.0](https://github.com/coreui/coreui/compare/v4.1.5...v4.2.0)
44

55
> 9 June 2022
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
Several quick start options are available:
4545

46-
- [Download the latest release](https://github.com/coreui/coreui/archive/v4.3.0-beta.0.zip)
46+
- [Download the latest release](https://github.com/coreui/coreui-pro/archive/v4.3.0-beta.0.zip)
4747
- Clone the repo: `git clone https://github.com/coreui/coreui.git`
4848
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/coreui`
4949
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/coreui`

config.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ params:
5454
social_image_path: /assets/brand/coreui-social.jpg
5555
social_logo_path: /assets/brand/coreui-social-logo.png
5656

57-
current_version: "4.1.6"
57+
current_version: "4.2.0"
5858
current_version_pro: "4.3.0-beta.0"
59-
current_ruby_version: "4.3.0-beta.0"
60-
docs_version: "4.2"
59+
current_ruby_version: "4.2.0"
60+
docs_version: "4.1"
6161
rfs_version: "9.0.3"
62-
github_org: "https://github.com/coreui"
62+
github_org: "https://github.com/coreui/coreui"
6363
repo: "https://github.com/coreui/coreui"
6464
twitter: "core_ui"
6565
opencollective: "coreui"
@@ -68,21 +68,21 @@ params:
6868
icons: "https://icons.coreui.io/"
6969

7070
download:
71-
source: "https://github.com/coreui/coreui/archive/v4.1.6.zip"
72-
dist: "https://github.com/coreui/coreui/releases/download/v4.1.6/coreui-4.1.6-dist.zip"
71+
source: "https://github.com/coreui/coreui/archive/v4.2.0.zip"
72+
dist: "https://github.com/coreui/coreui/releases/download/v4.2.0/coreui-4.2.0-dist.zip"
7373
source_pro: "https://github.com/coreui/coreui-pro/archive/v4.3.0-beta.0.zip"
7474
dist_pro: "https://github.com/coreui/coreui-pro/releases/download/v4.3.0-beta.0/coreui-4.3.0-beta.0-dist.zip"
7575

7676
cdn:
7777
# See https://www.srihash.org for info on how to generate the hashes
78-
css: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.1.6/dist/css/coreui.min.css"
79-
css_hash: "sha384-Kf8NZ2O8RmOe2/UuZNJzfFcViq58KD9JO8sokZtmmmQ3qJ5A6wmwdx+3HOD/RtcA"
80-
css_rtl: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.1.6/dist/css/coreui.rtl.min.css"
81-
css_rtl_hash: "sha384-3qN0XH7en5QmNkMdpc2aAuAiFpkcpQb1elNKNv/o+beL2Kbk+rHWAftYMG1fZe3p"
82-
js: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.1.6/dist/js/coreui.min.js"
83-
js_hash: "sha384-3R0ccvNsMgCzG7gK+Jd4pnj857Qi6JnHhdyg4PqzCzfbmHywym46733u2jRCknYT"
84-
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.1.6/dist/js/coreui.bundle.min.js"
85-
js_bundle_hash: "sha384-PdtZ3fcT/nuZENUPL59ZijpBtWO9PYasEAEn0JSRz0H24tcZ9Zhb9TPUby4B0HQJ"
78+
css: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.2.0/dist/css/coreui.min.css"
79+
css_hash: "sha384-UkVD+zxJKGsZP3s/JuRzapi4dQrDDuEf/kHphzg8P3v8wuQ6m9RLjTkPGeFcglQU"
80+
css_rtl: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.2.0/dist/css/coreui.rtl.min.css"
81+
css_rtl_hash: "sha384-7W1eMOzj3wRp1Oat/SJe+uPZ3lBB5YWlrjI9zeLbto2KkseMeJKSGAs4844qZPjz"
82+
js: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.2.0/dist/js/coreui.min.js"
83+
js_hash: "sha384-2hww80ziDjQXYpFulPf5tfdCCXLTxn70HdSwL9MfeEvpS0kjfHd1iaBRsLpnuaSC"
84+
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/coreui@4.2.0/dist/js/coreui.bundle.min.js"
85+
js_bundle_hash: "sha384-n0qOYeB4ohUPebL1M9qb/hfYkTp4lvnZM6U6phkRofqsMzK29IdkBJPegsyfj/r4"
8686
css_pro: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/css/coreui.min.css"
8787
css_pro_hash: "sha384-kny/YzE6QVHYlIB8FcqlzSGcQ8mOZCxkX7WGuvtP5U10pt9XRN+aDdYwHqL+k2cR"
8888
css_pro_rtl: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/css/coreui.rtl.min.css"
@@ -91,5 +91,5 @@ params:
9191
js_pro_hash: "sha384-e0s+7iN6hrKsmDgBT8JD6kRftdxn9VJXfnWaEm+EmY0cVns0A5SoZdonweAq0CtA"
9292
js_pro_bundle: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/js/coreui.bundle.min.js"
9393
js_pro_bundle_hash: "sha384-S/LlYnbXR1v5OxK3uByWi4CuAYlql6K2Emysrr3GRcV88It1Q8ggYxIDU9K2r9gb"
94-
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
95-
popper_hash: "sha384-Xe+8cL9oJa6tN/veChSP7q+mnSPaj5Bcu9mPX5F5xIGE0DVittaqT5lorf0EI7Vk"
94+
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
95+
popper_hash: "sha384-Xe+8cL9oJa6tN/veChSP7q+mnSPaj5Bcu9mPX5F5xIGE0DVittaqT5lorf0EI7Vk"

dist/css/bootstrap-grid.min.css

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

dist/css/bootstrap-grid.rtl.min.css

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

dist/css/bootstrap-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.rtl.min.css

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

dist/css/bootstrap-utilities.min.css

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

dist/css/bootstrap-utilities.rtl.min.css

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

dist/css/bootstrap.min.css

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

0 commit comments

Comments
 (0)