Skip to content

Commit 1872951

Browse files
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts: # dist/css/coreui-grid.css.map # dist/css/coreui-grid.min.css.map # dist/css/coreui-grid.rtl.css.map # dist/css/coreui-grid.rtl.min.css.map # dist/css/coreui-reboot.css.map # dist/css/coreui-reboot.rtl.css.map # 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.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/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/mixins/_utilities.scss
2 parents 6872ad9 + 654005e commit 1872951

File tree

125 files changed

+5036
-3500
lines changed

Some content is hidden

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

125 files changed

+5036
-3500
lines changed

CHANGELOG.md

Lines changed: 1933 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Changelog
2+
3+
{{#each releases}}
4+
{{#if href}}
5+
## {{#unless major}}{{/unless}}[{{title}}]({{href}})
6+
{{else}}
7+
## {{title}}
8+
{{/if}}
9+
10+
{{#if tag}}
11+
> {{niceDate}}
12+
{{/if}}
13+
{{#if summary}}
14+
15+
{{summary}}
16+
{{/if}}
17+
{{#if commits}}
18+
19+
{{! List commits with `feat: ` somewhere in the message }}
20+
{{#commit-list commits heading='### Features' message='feat:|feat(.*): '}}
21+
- {{subject}} [`{{shorthash}}`]({{href}})
22+
{{/commit-list}}
23+
24+
{{! List commits with `fix: ` somewhere in the message }}
25+
{{#commit-list commits heading='### Fix' message='fix:|fix(.*): '}}
26+
- {{subject}} [`{{shorthash}}`]({{href}})
27+
{{/commit-list}}
28+
29+
{{! List commits with `refactor: ` somewhere in the message }}
30+
{{#commit-list commits heading='### Refactor' message='refactor:|refactor(.*): '}}
31+
- {{subject}} [`{{shorthash}}`]({{href}})
32+
{{/commit-list}}
33+
34+
{{!-- {{#each commits}}
35+
- {{#if breaking}}**Breaking change:** {{/if}}{{subject}}{{#if href}} [`{{shorthash}}`]({{href}}){{/if}}
36+
{{/each}} --}}
37+
38+
{{/if}}
39+
{{!-- {{#if fixes}}
40+
41+
### Fixed
42+
43+
{{#each fixes}}
44+
- {{commit.subject}}{{#each fixes}}{{#if href}} [`#{{id}}`]({{href}}){{/if}}{{/each}}
45+
{{/each}}
46+
{{/if}} --}}
47+
{{/each}}

config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ params:
4747
social_image_path: /4.0/assets/brand/coreui-social.jpg
4848
social_logo_path: /4.0/assets/brand/coreui-social-logo.png
4949

50-
current_version: "4.0.0-alpha.2"
51-
current_ruby_version: "4.0.0-alpha.2"
50+
current_version: "4.0.0-alpha.3"
51+
current_ruby_version: "4.0.0-alpha.3"
5252
docs_version: "4.0"
5353
rfs_version: "9.0.3"
5454
github_org: "https://github.com/coreui"
@@ -59,17 +59,17 @@ params:
5959
icons: "https://icons.coreui.io/"
6060

6161
download:
62-
source: "https://github.com/coreui/coreui/archive/v4.0.0-alpha.2.zip"
63-
dist: "https://github.com/coreui/coreui/releases/download/v4.0.0-alpha.2/coreui-4.0.0-alpha.2-dist.zip"
62+
source: "https://github.com/coreui/coreui/archive/v4.0.0-alpha.3.zip"
63+
dist: "https://github.com/coreui/coreui/releases/download/v4.0.0-alpha.3/coreui-4.0.0-alpha.3-dist.zip"
6464

6565
cdn:
66-
css: "https://cdn.jsdelivr.net/npm/@coreui/[email protected].2/dist/css/coreui.min.css"
67-
css_hash: "sha384-hL+L9PKJVU/F+J2QBQ1HRgTGTrScDU0YiRBd79FqMtF6A9Q4xrgIpGz/S0Bd5kIr"
68-
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected].2/dist/css/coreui.rtl.min.css"
69-
css_rtl_hash: "sha384-VkJInvIT6LQ4K+s3rHSt3rtD3Vohgmrhqgs5NA8TbDYQpJjuuLsNqWLFOpSk5LQG"
70-
js: "https://cdn.jsdelivr.net/npm/@coreui/[email protected].2/dist/js/coreui.min.js"
71-
js_hash: "sha384-140mv1O8hO2dMsZA9L3+U6PSqdx1/Ev6PfbDUxpUSCQ8lA91kZ6HmV/T3yz4gAIN"
72-
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/[email protected].2/dist/js/coreui.bundle.min.js"
73-
js_bundle_hash: "sha384-Feli9IkxVnEtu5QziT6QmtZbnOfbTsiaHtX5+sLtHs3y6ystCozQ3btsf5BmATvR"
66+
css: "https://cdn.jsdelivr.net/npm/@coreui/[email protected].3/dist/css/coreui.min.css"
67+
css_hash: "sha384-1OzM0xuZ2+vwv0HCsz4CVa+qURRpsuaXsH8NoyulqmWfdEC/yFZwpvnf7dq4+QJ/"
68+
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected].3/dist/css/coreui.rtl.min.css"
69+
css_rtl_hash: "sha384-LkXDdYCdlOz0/da3BntY6ffDhCJj4T6D0iUcoeHpiUOP9Jv06yqfzOGyHOubZy+g"
70+
js: "https://cdn.jsdelivr.net/npm/@coreui/[email protected].3/dist/js/coreui.min.js"
71+
js_hash: "sha384-Y1KxpwMe9yL1HyI13hZe/8UImxZX08ss9/WjXc5PeMFpPzvLOgdIp5fh0LRf4dy2"
72+
js_bundle: "https://cdn.jsdelivr.net/npm/@coreui/[email protected].3/dist/js/coreui.bundle.min.js"
73+
js_bundle_hash: "sha384-rvB6A6RvkuUVLkdNjB1Nag2N/TzDHnd6sgPeVjDn8RfasT5/JJaUA0D+GvEwNQyU"
7474
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
7575
popper_hash: "sha384-EOlc5FUOsy7obkrpNXqD9DtrephzQpK7DXijDIKexeJT0qfn4dZ7GDid8suWuQHq"

dist/css/coreui-grid.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 deletions
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.

0 commit comments

Comments
 (0)