Skip to content

Commit 8795567

Browse files
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 # 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 # 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 658997e + 8ca516b commit 8795567

File tree

154 files changed

+4706
-3172
lines changed

Some content is hidden

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

154 files changed

+4706
-3172
lines changed

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"plugin:import/errors",
55
"plugin:import/warnings",
66
"plugin:unicorn/recommended",
7-
"xo/esnext",
7+
"xo",
88
"xo/browser"
99
],
1010
"rules": {
@@ -51,6 +51,7 @@
5151
"unicorn/prefer-dom-node-append": "off",
5252
"unicorn/prefer-dom-node-dataset": "off",
5353
"unicorn/prefer-dom-node-remove": "off",
54+
"unicorn/prefer-module": "off",
5455
"unicorn/prefer-query-selector": "off",
5556
"unicorn/prefer-spread": "off",
5657
"unicorn/prevent-abbreviations": "off"

.github/workflows-turnoff/js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
node: [10, 12, 14]
20+
node: [10, 12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141

4242
Several quick start options are available:
4343

44-
- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-beta.0.zip)
44+
- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-rc.0.zip)
4545
- Clone the repo: `git clone https://github.com/coreui/coreui.git`
4646
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/coreui@next`
4747
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/coreui@next`
48-
- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-beta.0`
48+
- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-rc.0`
4949

5050
Read the [Getting started page](https://coreui.io/docs/4.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
5151

build/build-plugins.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ const getConfigByPluginKey = pluginKey => {
6565
pluginKey === 'EventHandler' ||
6666
pluginKey === 'SelectorEngine' ||
6767
pluginKey === 'Util' ||
68-
pluginKey === 'Sanitizer'
68+
pluginKey === 'Sanitizer' ||
69+
pluginKey === 'Backdrop'
6970
) {
7071
return {
7172
external: []
@@ -133,7 +134,8 @@ const getConfigByPluginKey = pluginKey => {
133134

134135
const utilObjects = new Set([
135136
'Util',
136-
'Sanitizer'
137+
'Sanitizer',
138+
'Backdrop'
137139
])
138140

139141
const domObjects = new Set([

config.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ params:
4646
authors: "Lukasz Holeczek, Andrzej Kopanski"
4747
social_image_path: /4.0/assets/brand/coreui-social.jpg
4848
social_logo_path: /4.0/assets/brand/coreui-social-logo.png
49-
current_version: "4.0.0-beta.0"
50-
current_ruby_version: "4.0.0-beta.0"
49+
50+
current_version: "4.0.0-rc.0"
51+
current_ruby_version: "4.0.0-rc.0"
5152
docs_version: "4.0"
5253
rfs_version: "9.0.3"
5354
github_org: "https://github.com/coreui"
@@ -58,18 +59,18 @@ params:
5859
icons: "https://icons.coreui.io/"
5960

6061
download:
61-
source: "https://github.com/coreui/coreui/archive/v4.0.0-beta.0.zip"
62-
dist: "https://github.com/coreui/coreui/releases/download/v4.0.0-beta.0/coreui-4.0.0-beta.0-dist.zip"
62+
source: "https://github.com/coreui/coreui/archive/v4.0.0-rc.0.zip"
63+
dist: "https://github.com/coreui/coreui/releases/download/v4.0.0-rc.0/coreui-4.0.0-rc.0-dist.zip"
6364

6465
cdn:
6566
# See https://www.srihash.org for info on how to generate the hashes
66-
css: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]beta.0/dist/css/coreui.min.css"
67-
css_hash: "sha384-wAMAQlorouXowxBFxXk5v/OfhGpYsdcj1NQpiniWFRv2B1SRFWVfORwd9XVItH7g"
68-
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected]beta.0/dist/css/coreui.rtl.min.css"
69-
css_rtl_hash: "sha384-NtKj7vGSJSsaxaxEx2WsKsTOqIwMJxwJBENgCPQYVFBc9V0K84giHxwIr6pDwp+d"
70-
js: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]beta.0/dist/js/coreui.min.js"
71-
js_hash: "sha384-r9UuCGxKqS76V4DsQtwbCKmJoREyVX9UYgGcLStRK+ZTrMXjpKS5IwmCCi9FzHJZ"
72-
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]beta.0/dist/js/coreui.bundle.min.js"
73-
js_bundle_hash: "sha384-EEvn1uBLu9/DmDUYGfy+tzxC7/24HZV4R9jRi+06LYWkC1fQaSzukAR8b2rAz+nb"
74-
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected].0/dist/umd/popper.min.js"
67+
css: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]rc.0/dist/css/coreui.min.css"
68+
css_hash: "sha384-QDo3SP2/qeaTOnxc8wTtqNLob7zk6bm80R0XCrosLatZP+lRFzXY+D6ce43AymND"
69+
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected]rc.0/dist/css/coreui.rtl.min.css"
70+
css_rtl_hash: "sha384-bet8YcNfN+WUgL0GPZlsE+msFfDFA8qlhYiwk6JLWyu4thgf4CydegKqH9sWxVaq"
71+
js: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]rc.0/dist/js/coreui.min.js"
72+
js_hash: "sha384-5SrzQ5JRs8J6iUrCYL9Jq6lCwy4Wv6vnBQVvxz0EOepLwvYEnFI9uIST/6duZefH"
73+
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]rc.0/dist/js/coreui.bundle.min.js"
74+
js_bundle_hash: "sha384-qccmUe8KGfFpsi5wybxQPqN6U9k6+qp4FCmf5l5sJfIb4krTZTuXPu6cf75dnQ6P"
75+
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected].2/dist/umd/popper.min.js"
7576
popper_hash: "sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p"

dist/css/coreui-grid.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/coreui-grid.min.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/coreui-grid.rtl.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/coreui-grid.rtl.min.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/coreui-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.

0 commit comments

Comments
 (0)