Skip to content
This repository has been archived by the owner on Jun 5, 2020. It is now read-only.

Commit

Permalink
v1.2.2 - Updated Chrome extension, so it is now using the latest mast…
Browse files Browse the repository at this point in the history
…er external CSS. Updated links to new repo.
  • Loading branch information
itsjavi committed Oct 3, 2016
1 parent 1884507 commit c4f90fb
Show file tree
Hide file tree
Showing 39 changed files with 181 additions and 12,075 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -2,7 +2,7 @@
For feature requests, suggestions or ideas, add `[SUGGESTION]` before the title of the issue, for anything else follow the following guidelines.

### Guidelines
- Try to reproduce your problem in a separated environment, like in JSFiddle, [here is a template for it](http://jsfiddle.net/mjolnic/6aLndfgq/), that you can fork in the same page.
- Try to reproduce your problem in a separated environment, like in JSFiddle, [here is a template for it](http://jsfiddle.net/itsjavi/6aLndfgq/), that you can fork in the same page.
- Before posting your issue, consider adding this information:
* Expected behaviour: what should happen?
* Actual behaviour: what happens instead?
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Javier Aguilar @mjolnic
Copyright (c) 2016 Javi Aguilar

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,11 +2,11 @@ fontawesome-iconpicker
========================

Font Awesome Icon Picker is a fully customizable plugin for Twitter Bootstrap,
with a powerful base API, based on [bootstrap-popover-picker](http://mjolnic.github.io/bootstrap-popover-picker/)
with a powerful base API, based on [bootstrap-popover-picker](https://itsjavi.com/bootstrap-popover-picker/)

You can use Font Awesome or another font icon set of your choice (icon list is totally customizable).

[View demos](http://mjolnic.github.io/fontawesome-iconpicker/)
[View demos](https://itsjavi.com/fontawesome-iconpicker/)

## Instantiation

Expand Down
4 changes: 2 additions & 2 deletions bower.json
@@ -1,14 +1,14 @@
{
"name": "fontawesome-iconpicker",
"version": "1.2.0",
"version": "1.2.2",
"main": [
"dist/css/fontawesome-iconpicker.css",
"dist/css/fontawesome-iconpicker.min.css",
"dist/js/fontawesome-iconpicker.js",
"dist/js/fontawesome-iconpicker.min.js"
],
"dependencies": {
"jquery": "1.10 - 3",
"jquery": ">=1.10",
"bootstrap": "^3"
},
"ignore": [
Expand Down
18 changes: 9 additions & 9 deletions dist/css/fontawesome-iconpicker.css
@@ -1,28 +1,28 @@
/*!
* Font Awesome Icon Picker
* http://mjolnic.github.io/fontawesome-iconpicker/
* https://itsjavi.com/fontawesome-iconpicker/
*
* Originally written by (c) 2014 Javier Aguilar @mjolnic
* Originally written by (c) 2016 Javi Aguilar
* Licensed under the MIT License
* https://github.com/mjolnic/fontawesome-iconpicker/blob/master/LICENSE
* https://github.com/itsjavi/fontawesome-iconpicker/blob/master/LICENSE
*
*/
/*
* Font Awesome Icon Picker
* http://mjolnic.github.io/fontawesome-iconpicker/
* https://itsjavi.com/fontawesome-iconpicker/
*
* Originally written by (c) 2014 Javier Aguilar @mjolnic
* Originally written by (c) 2016 Javi Aguilar
* Licensed under the MIT License
* https://github.com/mjolnic/fontawesome-iconpicker/blob/master/LICENSE
* https://github.com/itsjavi/fontawesome-iconpicker/blob/master/LICENSE
*
*/
/*
* Font Awesome Icon Picker
* http://mjolnic.github.io/fontawesome-iconpicker/
* https://itsjavi.com/fontawesome-iconpicker/
*
* Originally written by (c) 2014 Javier Aguilar @mjolnic
* Originally written by (c) 2016 Javi Aguilar
* Licensed under the MIT License
* https://github.com/mjolnic/fontawesome-iconpicker/blob/master/LICENSE
* https://github.com/itsjavi/fontawesome-iconpicker/blob/master/LICENSE
*
*/
.iconpicker-popover.popover {
Expand Down
6 changes: 3 additions & 3 deletions dist/css/fontawesome-iconpicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions extension/LICENSE
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2016 Javi Aguilar

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

0 comments on commit c4f90fb

Please sign in to comment.