Skip to content

Commit 628e2f8

Browse files
Merge pull request #1 from coreui/master
Merge master
2 parents 0446212 + 2755f18 commit 628e2f8

File tree

152 files changed

+14940
-6129
lines changed

Some content is hidden

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

152 files changed

+14940
-6129
lines changed

.babelrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ module.exports = {
44
'@babel/preset-env',
55
{
66
'targets': {
7+
ie: 11,
8+
ie: 10,
79
'browsers': [
810
"> 1%",
911
"IE 10"
1012
]
1113
},
14+
useBuiltIns: 'usage',
15+
corejs: { version: 3, proposals: true },
1216
loose: true,
1317
modules: false,
1418
exclude: ['transform-typeof-symbol']

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"no-extra-parens": "error",
1414
"no-prototype-builtins": "error",
1515
"no-template-curly-in-string": "error",
16-
"compat/compat": "error",
16+
"compat/compat": "warn",
1717
"valid-jsdoc": "error",
1818

1919
// Best Practices

CHANGELOG.md

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,243 @@
1+
## v2.1.10
2+
- chore: drop `@babel/polyfill` in favour of `core-js@3` and `regenerator-runtime`
3+
4+
###### Dependencies update:
5+
- update `@babel/polyfill` to `^7.4.4`
6+
- update `@babel/cli` to `^7.4.4`
7+
- update `@babel/core` to `^7.4.5`
8+
- update `@babel/plugin-proposal-object-rest-spread` to `^7.4.4`
9+
- update `@babel/plugin-transform-runtime` to `^7.4.4`
10+
- update `@babel/preset-env` to `^7.4.5`
11+
- update `autoprefixer` to `^9.5.1`
12+
- update `babel-plugin-istanbul` to `^5.1.4`
13+
- update `clean-css-cli` to `^4.3.0`
14+
- update `eslint` to `^5.16.0`
15+
- update `node-sass` to `^4.12.0`
16+
- update `nodemon` to `^1.19.1`
17+
- update `rollup` to `^1.13.0`
18+
- update `stylelint-config-recommended-scss` to `^3.3.0`
19+
- update `stylelint-config-standard` to `^18.3.0`
20+
- update `stylelint-order` to `^2.2.1`
21+
- update `stylelint-scss` to `^3.7.0`
22+
- update `uglify-js` to `^3.6.0`
23+
- update `eslint-plugin-compat` to `^3.1.1`
24+
- update `rollup-plugin-commonjs` to `^10.0.0`
25+
- update `rollup-plugin-node-resolve` to `^5.0.1`
26+
- update `semver` to `^6.1.1`
27+
- update `stylelint` to `^10.0.1`
28+
- update `stylelint-order` to `^3.0.0`
29+
30+
## v2.1.9
31+
- fix(dropdown): rtl caret spacing
32+
- fix(input-group): rtl append, prepend border radius and margins
33+
- fix(rtl): rtl float, margin and padding
34+
- fix(button-group): rtl margin and border-radius
35+
###### Dependencies update:
36+
- update `@babel/core` to `^7.4.0`
37+
- update `@babel/plugin-proposal-object-rest-spread` to `^7.4.0`
38+
- update `@babel/plugin-transform-runtime` to `^7.4.0`
39+
- update `@babel/preset-env` to `^7.4.2`
40+
- update `autoprefixer` to `^9.5.0`
41+
- update `eslint` to `^5.15.3`
42+
- update `rollup` to `^1.7.0`
43+
- update `uglify-js` to `^3.5.1`
44+
45+
## v2.1.8
46+
- fix(scss): `cssnano` mangles `background-position` temp fix (re: BS4 misplaced validation feedback icons)
47+
###### Dependencies update:
48+
- update `@babel/core` to `^7.3.4`
49+
- update `@babel/plugin-proposal-object-rest-spread` to `^7.3.4`
50+
- update `@babel/plugin-transform-runtime` to `^7.3.4`
51+
- update `@babel/preset-env` to `^7.3.4`
52+
- update `autoprefixer` to `^9.4.10`
53+
- update `eslint` to `^5.15.1`
54+
- update `postcss-cli` to `^6.1.2`
55+
- update `rollup` to `^1.6.0`
56+
- update `rollup-plugin-commonjs` to `^9.2.1`
57+
- update `rollup-plugin-node-resolve` to `^4.0.1`
58+
- update `stylelint-order` to `^2.1.0`
59+
- update `stylelint-scss` to `^3.5.4`
60+
61+
## v2.1.7
62+
- update `bootstrap` to `^4.3.1` fixes *Class 'btn' style white-space: nowrap; has been removed creating issues with the btn with favicon* [#151](https://github.com/coreui/coreui-free-react-admin-template/issues/151)
63+
###### Dependencies update:
64+
- update `bootstrap` to `^4.3.1`
65+
- update `@babel/core` to `^7.3.3`
66+
- update `@babel/plugin-proposal-object-rest-spread` to `^7.3.2`
67+
- update `@babel/preset-env` to `^7.3.1`
68+
- update `autoprefixer` to `^9.4.8`
69+
- update `babel-plugin-istanbul` to `^5.1.1`
70+
- update `eslint` to `^5.14.1`
71+
- update `eslint-plugin-compat` to `^2.7.0`
72+
- update `nodemon` to `^1.18.10`
73+
- update `rollup` to `^1.2.2`
74+
- update `rollup-plugin-babel` to `^4.3.2`
75+
- update `rollup-plugin-node-resolve` to `^4.0.0`
76+
- update `stylelint` to `^9.10.1`
77+
- update `stylelint-scss` to `^3.5.3`
78+
79+
## v2.1.6
80+
- fix: clean exit on postinstall dependency missing #25
81+
- chore: update `rollup-plugin-babel` to `^4.3.0`
82+
83+
## v2.1.5
84+
###### Dependencies update:
85+
- chore: update `bootstrap` to `^4.2.1`
86+
- chore: update `@babel/polyfill` to `^7.2.5`
87+
- chore: update `@babel/cli` to `^7.2.3`
88+
- chore: update `@babel/core` to `^7.2.2`
89+
- chore: update `@babel/preset-env` to `^7.2.3`
90+
- chore: update `autoprefixer` to `^9.4.4`
91+
- chore: update `eslint` to `^5.12.0`
92+
- chore: update `node-sass` to `^4.11.0`
93+
- chore: update `nodemon` to `^1.18.9`
94+
- chore: update `postcss-cli` to `^6.1.1`
95+
- chore: update `rimraf` to `^2.6.3`
96+
- chore: update `rollup` to `^0.68.2`
97+
- chore: update `rollup-plugin-babel` to `^4.2.0`
98+
- chore: update `stylelint-scss` to `^3.4.4`
99+
###### Pull Requests:
100+
- Re-added composer file #35
101+
- Re-added composer file so new versions can be downloaded via composer
102+
- Replaced relative paths in .scss files so files can be generated correctly
103+
104+
## v2.1.4
105+
- fix(scss): .sidebar .nav-link.disabled
106+
- chore: update `@babel/cli` to `^7.2.0`
107+
- chore: update `@babel/core` to `^7.2.0`
108+
- chore: update `@babel/plugin-external-helpers` to `^7.2.0`
109+
- chore: update `@babel/plugin-proposal-object-rest-spread` to `^7.2.0`
110+
- chore: update `@babel/plugin-proposal-throw-expressions` to `^7.2.0`
111+
- chore: update `@babel/plugin-transform-runtime` to `^7.2.0`
112+
- chore: update `@babel/preset-env` to `^7.2.0`
113+
- chore: update `autoprefixer` to `^9.4.2`
114+
- chore: update `rollup` to `^0.67.4`
115+
- chore: update `stylelint` to `^9.9.0`
116+
- chore: update `stylelint-order` to `^2.0.0`
117+
- chore: update `stylelint-scss` to `^3.4.1`
118+
119+
## v2.1.3
120+
- chore: update `nodemon` to `1.18.7` (remove vulnerability)
121+
122+
## v2.1.2
123+
- fix: devDependencies security issues (event-stream, flatmap-stream)
124+
- chore: dependencies update
125+
- update `npm-run-all` to `^4.1.5`
126+
- reinstall `nodemon`
127+
```bash
128+
npm uninstall nodemon
129+
npm install --save-dev nodemon
130+
```
131+
132+
## v2.1.1
133+
- fix(sidebar): `url("data:,")` turns into `url("'data:,'")`
134+
now replaced with Base64 Encode of 1x1px Transparent gif, closes #49
135+
1. `ie11` ignores `list-style:none` (ie11 rtl sidebar minimized issue)
136+
2. `url("data:,")` turns into `url("'data:,'")` after minification
137+
3. angular 7 cli build complains on `url("'data:,'")`
138+
- chore: update `@babel/cli` to `7.1.5`
139+
- chore: update `stylelint` to `9.8.0`
140+
- chore: update `stylelint-scss` to `3.4.0`
141+
- chore: update `shelljs` to `0.8.3`
142+
- chore: update `@babel/preset-env` to `7.1.6`
143+
- chore: update `@babel/core` to `7.1.6`
144+
- chore: update `eslint` to `5.9.0`
145+
- chore: update `rollup` to `0.67.3`
146+
147+
## v2.1.0
148+
- feat(scss): sidebar-nav-link-disabled
149+
- chore: update `nodemon` to `1.18.6`
150+
151+
## v2.0.26
152+
- fix(.sidebar-minimizer): add `cursor: pointer`
153+
- feat: delegated event handlers to support turbolinks (sidebar, aside-menu)- thanks @RyanVasichko
154+
- chore: update `node-sass` to `4.10.0`
155+
- chore: update `rollup` to `0.67.0`
156+
157+
## v2.0.25
158+
- fix(buttons.scss): remove `button { @extend .btn; }`
159+
160+
## v2.0.24
161+
- fix(build): add missing `commonjs` for utilities
162+
- chore: add `@babel/polyfill`
163+
- fix(ie): add `NodeList` `forEach` polyfill
164+
- fix(sidebar): add `dataset.toggle` ie10 fix
165+
- fix(aside-menu): add `dataset.toggle` ie10 fix
166+
- chore(build): add `rollup-plugin-commonjs`
167+
168+
## v2.0.23
169+
_broken build, do not use_
170+
171+
## v2.0.22
172+
- fix(buttons.scss): wrong cursor for disabled state
173+
- chore: update `eslint` to `5.8.0`
174+
- chore: update `nodemon` to `1.18.5`
175+
- chore: update `stylelint` to `9.7.1`
176+
177+
## v2.0.21
178+
- feat(sidebar): mobile clickout behaviour
179+
- chore: update `@babel/plugin-external-helpers` to `7.0.0`
180+
- chore: update `autoprefixer` to `9.3.1`
181+
- chore: update `postcss-cli` to `6.0.1`
182+
- chore: update `stylelint-scss` to `3.3.2`
183+
184+
## v2.0.20
185+
- fix(layout): sidebar on mobile issue [#23](https://github.com/coreui/coreui-angular/issues/23)
186+
- fix: sidebar, sidebar-minimizer `rtl` ie issues, tweaks
187+
- refactor(sidebar.js): ps minor cleanup
188+
- chore: update `autoprefixer` to `9.2.1`
189+
190+
## v2.0.19
191+
- refactor: extract getCssCustomProperties function
192+
- feat: add getColor function
193+
- feat: sidebar set active using query string PR #21
194+
- chore: update `node-sass` to `4.9.4`
195+
- chore: update `eslint` to `5.7.0`
196+
- chore: update `babel-plugin-istanbul` to `5.1.0`
197+
- chore: update `semver` to `5.6.0`
198+
- chore: update `autoprefixer` to `9.2.0`
199+
200+
## v2.0.18
201+
- feat: add deep objects merge utility
202+
- chore: build rollup utilities script cleanup
203+
- fix(rgbToHex): transparent is not a valid rgb color ie issue
204+
205+
## v2.0.17
206+
- fix(card): `rtl` for `card-header` icon margins
207+
- fix(sidebar): `rtl` for `sidebar-minimizer` icon
208+
- chore: update `rollup` to `0.66.6`
209+
- thanks @MrDevIr
210+
211+
## v2.0.16
212+
- fix(breadcrumb): `rtl` padding
213+
- fix(card): `rtl` float for `card-header-actions`
214+
- fix(sidebar): `rtl` ps scrollbar issue temp fix/refactor
215+
- chore: update `rollup` to `0.66.5`
216+
217+
## v2.0.15
218+
- feat(sidebar): `badge` margins for `nav-dropdown-toggle`
219+
- chore: update `eslint-plugin-compat` to `2.6.2`
220+
- chore: update `rollup` to `0.66.4`
221+
222+
## v2.0.14
223+
- fix(scss): add missing `light-blue` color variable
224+
225+
## v2.0.13
226+
- chore: update `@babel/core` to `7.1.2`
227+
- chore: update `@babel/cli` to `7.1.2`
228+
- chore: update `eslint` to `5.6.1`
229+
230+
## v2.0.12
231+
- fix(layout) `aside` IE issue with `.main` margin on mobile
232+
- fix(sidebar) `rtl` IE issue with `sidebar-minimized` captions
233+
- fix(sidebar) `rtl` ps scrollbar issue temp fix
234+
235+
## v2.0.11
236+
- fix(layout) `sidebar-fixed` IE issue with `.main` margin on mobile
237+
- fix(sidebar) `sidebar-toggler` issue for `rtl`
238+
- chore: update `babel-eslint` to `10.0.1`
239+
- chore: update `stylelint` to `9.6.0`
240+
1241
## v2.0.10
2242
- fix(_layout.scss) `navbar-brand` top position IE issue
3243
- chore: update `babel-eslint` to `10.0.0`

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
[![npm package][npm-badge]][npm]
2+
[![NPM downloads][npm-download]][npm]
3+
4+
[npm-badge]: https://img.shields.io/npm/v/@coreui/coreui.png?style=flat-square
5+
[npm-download]: https://img.shields.io/npm/dm/@coreui/coreui.svg?style=flat-square
6+
[npm]: https://www.npmjs.com/package/@coreui/coreui
7+
18
# CoreUI - Free WebApp UI Kit built on top of Bootstrap 4 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Bootstrap%204%20Admin%20Template%20&url=https://coreui.io&hashtags=bootstrap,admin,template,dashboard,panel,free,angular,react,vue)
29

310
Please help us on [Product Hunt](https://www.producthunt.com/posts/coreui-open-source-bootstrap-4-admin-template-with-angular-2-react-js-vue-js-support) and [Designer News](https://www.designernews.co/stories/81127). Thanks in advance!
@@ -52,13 +59,13 @@ $ npm install @coreui/coreui --save
5259
### Yarn
5360

5461
``` bash
55-
$ yarn add @coreui/coreui@2.0.10
62+
$ yarn add @coreui/coreui@2.1.10
5663
```
5764

5865
### Composer
5966

6067
``` bash
61-
$ composer require coreui/coreui:2.0.10
68+
$ composer require coreui/coreui:2.1.10
6269
```
6370

6471
## Usage

build/rollup.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const path = require('path')
44
const babel = require('rollup-plugin-babel')
55
const resolve = require('rollup-plugin-node-resolve')
6+
const commonjs = require('rollup-plugin-commonjs')
67

78
const pkg = require(path.resolve(__dirname, '../package.json'))
89
const BUNDLE = process.env.BUNDLE === 'true'
@@ -11,6 +12,8 @@ const year = new Date().getFullYear()
1112
let fileDest = 'coreui.js'
1213
const external = ['jquery', 'perfect-scrollbar']
1314
const plugins = [
15+
resolve(),
16+
commonjs(),
1417
babel({
1518
exclude: 'node_modules/**', // Only transpile our source code
1619
externalHelpersWhitelist: [ // Include only required helpers
@@ -41,6 +44,7 @@ module.exports = {
4144
* Copyright ${year} ${pkg.author.name}
4245
* Licensed under MIT (${pkg.homepage})
4346
*/`,
47+
sourcemap: true,
4448
file: path.resolve(__dirname, `../dist/js/${fileDest}`),
4549
format: 'umd',
4650
globals,

build/rollup.config.utilities.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
const path = require('path')
44
const babel = require('rollup-plugin-babel')
55
const resolve = require('rollup-plugin-node-resolve')
6+
const commonjs = require('rollup-plugin-commonjs')
67

78
const pkg = require(path.resolve(__dirname, '../package.json'))
89
const BUNDLE = process.env.BUNDLE === 'true'
910
const year = new Date().getFullYear()
1011

1112
let fileDest = 'coreui-utilities.js'
1213
const plugins = [
14+
resolve(),
15+
commonjs(),
1316
babel({
1417
exclude: 'node_modules/**', // Only transpile our source code
1518
externalHelpersWhitelist: [ // Include only required helpers
@@ -23,8 +26,6 @@ const plugins = [
2326

2427
if (BUNDLE) {
2528
fileDest = 'utilities.bundle.js'
26-
// Remove last entry in external array to bundle Popper
27-
external.pop()
2829
plugins.push(resolve())
2930
}
3031

composer.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"name": "coreui/coreui",
3+
"description": "Open Source UI Kit built on top of Bootstrap 4",
4+
"keywords": [
5+
"css",
6+
"js",
7+
"sass",
8+
"mobile-first",
9+
"responsive",
10+
"front-end",
11+
"framework",
12+
"web"
13+
],
14+
"homepage": "https://coreui.io",
15+
"authors": [
16+
{
17+
"name": "Łukasz Holeczek",
18+
"email": "[email protected]"
19+
}
20+
],
21+
"contributors": [
22+
{
23+
"name": "Andrzej Kopański",
24+
"email": "[email protected]"
25+
}
26+
],
27+
"support": {
28+
"issues": "https://github.com/coreui/coreui/issues"
29+
},
30+
"license": "MIT"
31+
}

0 commit comments

Comments
 (0)