Skip to content

Commit 9a6459f

Browse files
committed
Merge branch 'master' of https://github.com/coreui/coreui-pro
2 parents dd91c6c + 665913a commit 9a6459f

Some content is hidden

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

59 files changed

+3120
-5552
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,6 @@ Please use following commit message format.
173173
- "Attractive"
174174
- Don't use [jQuery event alias convenience methods](https://github.com/jquery/jquery/blob/master/src/event/alias.js) (such as `$().focus()`). Instead, use [`$().trigger(eventType, ...)`](http://api.jquery.com/trigger/) or [`$().on(eventType, ...)`](http://api.jquery.com/on/), depending on whether you're firing an event or listening for an event. (For example, `$().trigger('focus')` or `$().on('focus', function (event) { /* handle focus event */ })`) We do this to be compatible with custom builds of jQuery where the event aliases module has been excluded.
175175

176-
## License
176+
## Copyright and license
177177

178-
By contributing your code, you agree to license your contribution under the [MIT License](LICENSE).
178+
copyright 2018 creativeLabs Łukasz Holeczek.

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ $ npm install @coreui/coreui --save
5252
### Yarn
5353

5454
``` bash
55-
$ yarn add @coreui/[email protected].3
55+
$ yarn add @coreui/[email protected].4
5656
```
5757

5858
### Composer
5959

6060
``` bash
61-
$ composer require coreui/coreui:2.0.3
61+
$ composer require coreui/coreui:2.0.4
6262
```
6363

6464
## Usage
@@ -130,8 +130,7 @@ Get updates on CoreUI's development and chat with the project maintainers and co
130130

131131
## Copyright and license
132132

133-
copyright 2018 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui/blob/master/LICENSE).
134-
There is only one limitation you can't can’t re-distribute the CoreUI as stock. You can’t do this if you modify the CoreUI. In past we faced some problems with persons who tried to sell CoreUI based templates.
133+
copyright 2018 creativeLabs Łukasz Holeczek.
135134

136135
## Support CoreUI Development
137136

build/rollup.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ module.exports = {
3939
banner: `/*!
4040
* CoreUI Pro v${pkg.version} (${pkg.homepage})
4141
* Copyright ${year} ${pkg.author.name}
42-
* Licensed under MIT (${pkg.homepage})
4342
*/`,
4443
file: path.resolve(__dirname, `../dist/js/${fileDest}`),
4544
format: 'umd',

build/rollup.config.utilities.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ export default {
3232
input: path.resolve(__dirname, '../js/src/utilities/index.js'),
3333
output: {
3434
banner: `/*!
35-
* CoreUI v${pkg.version} (${pkg.homepage})
35+
* CoreUI Pro v${pkg.version} (${pkg.homepage})
3636
* Copyright ${year} ${pkg.author.name}
37-
* Licensed under MIT (${pkg.homepage})
3837
*/`,
3938
file: path.resolve(__dirname, `../dist/js/${fileDest}`),
4039
format: 'umd',

dist/css/bootstrap.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/bootstrap.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-standalone.css

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

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

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

0 commit comments

Comments
 (0)