Skip to content

Commit

Permalink
Changes:
Browse files Browse the repository at this point in the history
* Support for Bootstrap 4.x.
* Support for multiple versions of Font Awesome Icons (Free and Pro). (v5.3.1, v5.3.1_pro)
* Support for Weather Icons. (v2.0.10)
* Change default options: arrowNextIconClass = fas fa-arrow-right (Previous value: glyphicon glyphicon-arrow-right),
arrowPrevIconClass = fas fa-arrow-left (Previous value: glyphicon glyphicon-arrow-left), iconset = fontawesome5 (Previous value: glyphicon), unselectedClass = btn-secondary. (Previous value: btn-default).
* Add file bootstrap-iconpicker.bundle.min.js, this file includes bootstrap-iconpicker-iconset-all.min.js and bootstrap-iconpicker.min.js files.
  • Loading branch information
victor-valencia committed Oct 16, 2018
1 parent 6793dcb commit 24cf38f
Show file tree
Hide file tree
Showing 23 changed files with 8,039 additions and 828 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2017 victor-valencia
Copyright (c) 2013-2018 victor-valencia

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
Expand Down
26 changes: 15 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
[![Issues](http://img.shields.io/github/issues/victor-valencia/bootstrap-iconpicker.svg)](https://github.com/victor-valencia/bootstrap-iconpicker/issues?q=is%3Aopen)
[![Issues](http://img.shields.io/badge/license-MIT-red.svg)](https://github.com/victor-valencia/bootstrap-iconpicker/blob/master/LICENSE)

# [Bootstrap-Iconpicker v1.9.0](http://victor-valencia.github.io/bootstrap-iconpicker)
![Iconpicker](bootstrap-iconpicker.png)
# [Bootstrap-Iconpicker v1.10.0](http://victor-valencia.github.io/bootstrap-iconpicker)
![Iconpicker](bootstrap-iconpicker_4x.png)

A simple iconpicker for Bootstrap 3.x.
A simple iconpicker for Bootstrap 3.x and 4.x.

Please note that this project is for [Bootstrap 3.x](http://getbootstrap.com/), including Glyphicons.
Please note that this project is for [Bootstrap 3.x and 4.x](http://getbootstrap.com/), including Glyphicons in Bootstrap 3.x.
Other icon fonts thats supports: [Elusive Icons](http://press.codes/downloads/elusive-icons-webfont/), [Font Awesome](http://fontawesome.io/), [Ionicons](http://ionicons.com/), [Map Icons](http://map-icons.com/), [Material Design Icons](http://zavoloklom.github.io/material-design-iconic-font/), [Octicons](https://octicons.github.com/), [Typicons](http://typicons.com), [Weather Icons](http://erikflowers.github.io/weather-icons/), [Flag Icons](http://flag-icon-css.lip.is/).

## Table of contents
Expand All @@ -33,7 +33,7 @@ Other icon fonts thats supports: [Elusive Icons](http://press.codes/downloads/el

Several quick start options are available:

- Download the latest release: [![Tag](http://img.shields.io/github/release/victor-valencia/bootstrap-iconpicker.svg)](https://github.com/victor-valencia/bootstrap-iconpicker/archive/v1.9.0.zip).
- Download the latest release: [![Tag](http://img.shields.io/github/release/victor-valencia/bootstrap-iconpicker.svg)](https://github.com/victor-valencia/bootstrap-iconpicker/archive/v1.10.0.zip).
- Clone the repo: `git clone https://github.com/victor-valencia/bootstrap-iconpicker.git`.
- Install with [Bower](http://bower.io): `bower install bootstrap-iconpicker`.
- Install with [npm](https://www.npmjs.com): `npm install bootstrap-iconpicker`.
Expand All @@ -42,9 +42,10 @@ Several quick start options are available:

The [CDN](https://cdnjs.com/libraries/bootstrap-iconpicker) is updated after the release is made public, which means that there is a delay between the publishing of a release and its availability on the CDN. Check the GitHub page for the latest release.

- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.9.0/css/bootstrap-iconpicker.min.css](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.9.0/css/bootstrap-iconpicker.min.css)
- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.9.0/js/bootstrap-iconpicker-iconset-all.min.js](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.9.0/js/bootstrap-iconpicker-iconset-all.min.js)
- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.9.0/js/bootstrap-iconpicker.min.js](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.9.0/js/bootstrap-iconpicker.min.js)
- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/css/bootstrap-iconpicker.min.css](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/css/bootstrap-iconpicker.min.css)
- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/js/bootstrap-iconpicker-iconset-all.min.js](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/js/bootstrap-iconpicker-iconset-all.min.js)
- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/js/bootstrap-iconpicker.bundle.min.js](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/js/bootstrap-iconpicker.bundle.min.js)
- [https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/js/bootstrap-iconpicker.min.js](https://cdnjs.cloudflare.com/ajax/libs/bootstrap-iconpicker/1.10.0/js/bootstrap-iconpicker.min.js)

### What's included
Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:
Expand All @@ -57,6 +58,7 @@ bootstrap-iconpicker/
├── js/
│ ├── bootstrap-iconpicker-iconset-all.js
│ ├── bootstrap-iconpicker-iconset-all.min.js
│ ├── bootstrap-iconpicker.bundle.min.js
│ ├── bootstrap-iconpicker.js
│ └── bootstrap-iconpicker.min.js
```
Expand All @@ -65,6 +67,8 @@ We provide compiled CSS and JS (`bootstrap-iconpicker.*`), as well as compiled a

All iconset includes in previous versions are included in file (`bootstrap-iconpicker-iconset-all.js`) compiled and (`bootstrap-iconpicker-iconset-all.min.js`) minified.

Files (`bootstrap-iconpicker-iconset-all.min.js`) and (`bootstrap-iconpicker.min.js`) are included in bundle version (`bootstrap-iconpicker.bundle.min.js`).

## Supported Iconset
You can see all suported iconset in [this doc](docs/SUPPORTED.md).

Expand Down Expand Up @@ -103,10 +107,10 @@ For more information on SemVer, please visit <http://semver.org/>.
Licensed under [the MIT license](LICENSE).

## Used by
- [Cake Cup](http://www.cake-cup.mx/)
- [Cake Cup](http://cake-cup.herokuapp.com/)
- [SAPRIGRAT](http://www.saprigrat.mx/)
- [KML App](http://kml-riegotec.rhcloud.com/)
- [Opti Riego](http://or-sdayr.rhcloud.com/)
- [KML App](http://kml-riegotec.herokuapp.com/)
- [Opti Riego](http://optiriego.herokuapp.com/)

Does your organization use bootstrap-iconpicker?
Open an issue, and include a link, and you'll be added to the list.
Binary file removed bootstrap-iconpicker.png
Binary file not shown.
Binary file added bootstrap-iconpicker_3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bootstrap-iconpicker_4x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 16 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap-iconpicker",
"description": "Simple Iconpicker for Bootstrap 3.x",
"version": "1.9.0",
"description": "Simple Iconpicker for Bootstrap 3.x and 4.x",
"version": "1.10.0",
"keywords": [
"Bootstrap",
"Iconpicker",
Expand Down Expand Up @@ -29,8 +29,13 @@
"url": "http://victor-valencia.github.io/bootstrap-iconpicker"
},
"main": [
"dist/css/bootstrap-iconpicker.css",
"dist/css/bootstrap-iconpicker.min.css",
"dist/js/bootstrap-iconpicker-iconset-all.js",
"dist/js/bootstrap-iconpicker-iconset-all.min.js",
"dist/js/bootstrap-iconpicker.bundle.min.js",
"dist/js/bootstrap-iconpicker.js",
"dist/css/bootstrap-iconpicker.css"
"dist/js/bootstrap-iconpicker.min.js"
],
"ignore": [
"/.*",
Expand All @@ -40,15 +45,19 @@
"/util",
"/src",
"banner.js",
"bootstrap-iconpicker.png",
"bootstrap-iconpicker_3x.png",
"bootstrap-iconpicker_4x.png",
"gruntfile.js",
"index_v3x.html",
"index.html",
"package.json",
"README.md"
"README.md",
"docs/SUPPORTED.md",
"docs/CHANGELOG.md"
],
"dependencies": {
"jquery" : "~1.10.2",
"bootstrap": "~3.3.7"
"jquery" : "~3.3.1",
"bootstrap": "~4.1.3"
},
"devDependencies": {
"sinonjs": "^1.17.1"
Expand Down
4 changes: 2 additions & 2 deletions dist/css/bootstrap-iconpicker.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!========================================================================
* File: bootstrap-iconpicker.css v1.9.0 by @victor-valencia
* File: bootstrap-iconpicker.css v1.10.0 by @victor-valencia
* https://victor-valencia.github.com/bootstrap-iconpicker
* ========================================================================
* Copyright 2013-2017 Victor Valencia Rico.
* Copyright 2013-2018 Victor Valencia Rico.
* Licensed under MIT license.
* https://github.com/victor-valencia/bootstrap-iconpicker/blob/master/LICENSE
* ========================================================================
Expand Down
4 changes: 2 additions & 2 deletions dist/css/bootstrap-iconpicker.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!========================================================================
* File: bootstrap-iconpicker.min.css v1.9.0 by @victor-valencia
* File: bootstrap-iconpicker.min.css v1.10.0 by @victor-valencia
* https://victor-valencia.github.com/bootstrap-iconpicker
* ========================================================================
* Copyright 2013-2017 Victor Valencia Rico.
Expand All @@ -8,4 +8,4 @@
* ========================================================================
*/

.iconpicker .caret{margin-left:10px!important}.iconpicker{min-width:60px}.iconpicker input.search-control{margin-bottom:6px;margin-top:6px}div.iconpicker.left .table-icons{margin-right:auto}div.iconpicker.center .table-icons{margin-left:auto;margin-right:auto}div.iconpicker.right .table-icons{margin-left:auto}.table-icons .btn{min-height:30px;min-width:35px;text-align:center;padding:0;margin:2px}.table-icons td{min-width:39px}.popover{max-width:inherit!important}.iconpicker-popover{z-index:1050!important}.iconpicker-popover .search-control{margin-bottom:6px;margin-top:6px}
.iconpicker .caret{margin-left:10px!important}.iconpicker{min-width:60px}.iconpicker input.search-control{margin-bottom:6px;margin-top:6px}div.iconpicker.left .table-icons{margin-right:auto}div.iconpicker.center .table-icons{margin-left:auto;margin-right:auto}div.iconpicker.right .table-icons{margin-left:auto}.table-icons .btn{min-height:30px;min-width:35px;text-align:center;padding:0;margin:2px}.table-icons td{min-width:39px}.popover{max-width:inherit!important}.iconpicker-popover{z-index:1050!important}.iconpicker-popover .search-control{margin-bottom:6px;margin-top:6px}
Loading

0 comments on commit 24cf38f

Please sign in to comment.