Skip to content

Commit b3ee17d

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.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.scss
2 parents 5ff08af + 5c4eec0 commit b3ee17d

File tree

97 files changed

+561
-481
lines changed

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

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-alpha.5.zip)
44+
- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-beta.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-alpha.5`
48+
- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-beta.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

config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ 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-alpha.5"
50-
current_ruby_version: "4.0.0-alpha.5"
49+
current_version: "4.0.0-beta.0"
50+
current_ruby_version: "4.0.0-beta.0"
5151
docs_version: "4.0"
5252
rfs_version: "9.0.3"
5353
github_org: "https://github.com/coreui"
@@ -58,18 +58,18 @@ params:
5858
icons: "https://icons.coreui.io/"
5959

6060
download:
61-
source: "https://github.com/coreui/coreui/archive/v4.0.0-alpha.5.zip"
62-
dist: "https://github.com/coreui/coreui/releases/download/v4.0.0-alpha.5/coreui-4.0.0-alpha.5-dist.zip"
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"
6363

6464
cdn:
6565
# See https://www.srihash.org for info on how to generate the hashes
66-
css: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]alpha.5/dist/css/coreui.min.css"
67-
css_hash: "sha384-nq/FcuyWO6kBZwQBQe8qhEg1ZijKo3hUGxXUPioCrYg3+qzJ5oiOWxgdMbx99Uvn"
68-
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected]alpha.5/dist/css/coreui.rtl.min.css"
69-
css_rtl_hash: "sha384-aYFu/+a5HgTdKB1OifM22TDa8/olw1MwfLfFKmt3eghKMgvObHs50k1TDMJZKLrN"
70-
js: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]alpha.5/dist/js/coreui.min.js"
71-
js_hash: "sha384-wcl5o76hhofzSFCtu4v3MPp2iasgPXqvmTRH42vlbCSKGQW6fTJfNtXgZoptMh+O"
72-
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]alpha.5/dist/js/coreui.bundle.min.js"
73-
js_bundle_hash: "sha384-AwyzMIzmGh58Iz7SoiQ2VoGasfZw82kgX0vYAOtapnFtlSv2UXjQ4VkM4BJAo6A4"
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"
7474
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
75-
popper_hash: "sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG"
75+
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.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.

dist/css/coreui-reboot.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-reboot.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-utilities.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-utilities.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.

0 commit comments

Comments
 (0)