Skip to content

Commit eeea12e

Browse files
mrholekmrholek
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts: # 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 # 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 4f99124 + 724e43c commit eeea12e

File tree

131 files changed

+4395
-3881
lines changed

Some content is hidden

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

131 files changed

+4395
-3881
lines changed

‎.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# Don't diff or textually merge source maps
55
*.map binary
66

7-
bootstrap.css linguist-vendored=false
8-
bootstrap.js linguist-vendored=false
7+
coreui.css linguist-vendored=false
8+
coreui.js linguist-vendored=false

‎.github/release-drafter.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ categories:
1717
- 'fix'
1818
- 'bugfix'
1919
- 'bug'
20-
- title: '⚡ Performance Improvements'
20+
- title: '⚡ Performance improvements'
2121
labels:
2222
- 'performance'
2323
- title: '🎨 CSS'
@@ -29,6 +29,9 @@ categories:
2929
- title: '📖 Docs'
3030
labels:
3131
- 'docs'
32+
- title: '🛠 Examples'
33+
labels:
34+
- 'examples'
3235
- title: '🌎 Accessibility'
3336
labels:
3437
- 'accessibility'

‎.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, 16]
20+
node: [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-rc.0.zip)
44+
- [Download the latest release](https://github.com/coreui/coreui/archive/v4.0.0-rc.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-rc.0`
48+
- Install with [Composer](https://getcomposer.org/): `composer require coreui/coreui:4.0.0-rc.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/build-plugins.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ const defaultPluginConfig = {
5858
}
5959
}
6060

61+
// eslint-disable-next-line complexity
6162
const getConfigByPluginKey = pluginKey => {
6263
if (
6364
pluginKey === 'Data' ||

‎config.yml

Lines changed: 4 additions & 4 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-rc.0"
51-
current_ruby_version: "4.0.0-rc.0"
50+
current_version: "4.0.0-rc.3"
51+
current_ruby_version: "4.0.0-rc.3"
5252
docs_version: "4.0"
5353
rfs_version: "9.0.3"
5454
github_org: "https://github.com/coreui"
@@ -59,8 +59,8 @@ params:
5959
icons: "https://icons.coreui.io/"
6060

6161
download:
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"
62+
source: "https://github.com/coreui/coreui/archive/v4.0.0-rc.3.zip"
63+
dist: "https://github.com/coreui/coreui/releases/download/v4.0.0-rc.3/coreui-4.0.0-rc.3-dist.zip"
6464

6565
cdn:
6666
# See https://www.srihash.org for info on how to generate the hashes

‎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.

0 commit comments

Comments
 (0)