Skip to content

Commit 24cf38f

Browse files
Changes:
* 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.
1 parent 6793dcb commit 24cf38f

23 files changed

+8039
-828
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2017 victor-valencia
3+
Copyright (c) 2013-2018 victor-valencia
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
[![Issues](http://img.shields.io/github/issues/victor-valencia/bootstrap-iconpicker.svg)](https://github.com/victor-valencia/bootstrap-iconpicker/issues?q=is%3Aopen)
88
[![Issues](http://img.shields.io/badge/license-MIT-red.svg)](https://github.com/victor-valencia/bootstrap-iconpicker/blob/master/LICENSE)
99

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

13-
A simple iconpicker for Bootstrap 3.x.
13+
A simple iconpicker for Bootstrap 3.x and 4.x.
1414

15-
Please note that this project is for [Bootstrap 3.x](http://getbootstrap.com/), including Glyphicons.
15+
Please note that this project is for [Bootstrap 3.x and 4.x](http://getbootstrap.com/), including Glyphicons in Bootstrap 3.x.
1616
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/).
1717

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

3434
Several quick start options are available:
3535

36-
- 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).
36+
- 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).
3737
- Clone the repo: `git clone https://github.com/victor-valencia/bootstrap-iconpicker.git`.
3838
- Install with [Bower](http://bower.io): `bower install bootstrap-iconpicker`.
3939
- Install with [npm](https://www.npmjs.com): `npm install bootstrap-iconpicker`.
@@ -42,9 +42,10 @@ Several quick start options are available:
4242

4343
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.
4444

45-
- [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)
46-
- [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)
47-
- [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)
45+
- [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)
46+
- [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)
47+
- [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)
48+
- [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)
4849

4950
### What's included
5051
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:
@@ -57,6 +58,7 @@ bootstrap-iconpicker/
5758
├── js/
5859
│ ├── bootstrap-iconpicker-iconset-all.js
5960
│ ├── bootstrap-iconpicker-iconset-all.min.js
61+
│ ├── bootstrap-iconpicker.bundle.min.js
6062
│ ├── bootstrap-iconpicker.js
6163
│ └── bootstrap-iconpicker.min.js
6264
```
@@ -65,6 +67,8 @@ We provide compiled CSS and JS (`bootstrap-iconpicker.*`), as well as compiled a
6567

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

70+
Files (`bootstrap-iconpicker-iconset-all.min.js`) and (`bootstrap-iconpicker.min.js`) are included in bundle version (`bootstrap-iconpicker.bundle.min.js`).
71+
6872
## Supported Iconset
6973
You can see all suported iconset in [this doc](docs/SUPPORTED.md).
7074

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

105109
## Used by
106-
- [Cake Cup](http://www.cake-cup.mx/)
110+
- [Cake Cup](http://cake-cup.herokuapp.com/)
107111
- [SAPRIGRAT](http://www.saprigrat.mx/)
108-
- [KML App](http://kml-riegotec.rhcloud.com/)
109-
- [Opti Riego](http://or-sdayr.rhcloud.com/)
112+
- [KML App](http://kml-riegotec.herokuapp.com/)
113+
- [Opti Riego](http://optiriego.herokuapp.com/)
110114

111115
Does your organization use bootstrap-iconpicker?
112116
Open an issue, and include a link, and you'll be added to the list.

bootstrap-iconpicker.png

-8.23 KB
Binary file not shown.

bootstrap-iconpicker_3x.png

8.95 KB
Loading

bootstrap-iconpicker_4x.png

8.26 KB
Loading

bower.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap-iconpicker",
3-
"description": "Simple Iconpicker for Bootstrap 3.x",
4-
"version": "1.9.0",
3+
"description": "Simple Iconpicker for Bootstrap 3.x and 4.x",
4+
"version": "1.10.0",
55
"keywords": [
66
"Bootstrap",
77
"Iconpicker",
@@ -29,8 +29,13 @@
2929
"url": "http://victor-valencia.github.io/bootstrap-iconpicker"
3030
},
3131
"main": [
32+
"dist/css/bootstrap-iconpicker.css",
33+
"dist/css/bootstrap-iconpicker.min.css",
34+
"dist/js/bootstrap-iconpicker-iconset-all.js",
35+
"dist/js/bootstrap-iconpicker-iconset-all.min.js",
36+
"dist/js/bootstrap-iconpicker.bundle.min.js",
3237
"dist/js/bootstrap-iconpicker.js",
33-
"dist/css/bootstrap-iconpicker.css"
38+
"dist/js/bootstrap-iconpicker.min.js"
3439
],
3540
"ignore": [
3641
"/.*",
@@ -40,15 +45,19 @@
4045
"/util",
4146
"/src",
4247
"banner.js",
43-
"bootstrap-iconpicker.png",
48+
"bootstrap-iconpicker_3x.png",
49+
"bootstrap-iconpicker_4x.png",
4450
"gruntfile.js",
51+
"index_v3x.html",
4552
"index.html",
4653
"package.json",
47-
"README.md"
54+
"README.md",
55+
"docs/SUPPORTED.md",
56+
"docs/CHANGELOG.md"
4857
],
4958
"dependencies": {
50-
"jquery" : "~1.10.2",
51-
"bootstrap": "~3.3.7"
59+
"jquery" : "~3.3.1",
60+
"bootstrap": "~4.1.3"
5261
},
5362
"devDependencies": {
5463
"sinonjs": "^1.17.1"

dist/css/bootstrap-iconpicker.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*!========================================================================
2-
* File: bootstrap-iconpicker.css v1.9.0 by @victor-valencia
2+
* File: bootstrap-iconpicker.css v1.10.0 by @victor-valencia
33
* https://victor-valencia.github.com/bootstrap-iconpicker
44
* ========================================================================
5-
* Copyright 2013-2017 Victor Valencia Rico.
5+
* Copyright 2013-2018 Victor Valencia Rico.
66
* Licensed under MIT license.
77
* https://github.com/victor-valencia/bootstrap-iconpicker/blob/master/LICENSE
88
* ========================================================================
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!========================================================================
2-
* File: bootstrap-iconpicker.min.css v1.9.0 by @victor-valencia
2+
* File: bootstrap-iconpicker.min.css v1.10.0 by @victor-valencia
33
* https://victor-valencia.github.com/bootstrap-iconpicker
44
* ========================================================================
55
* Copyright 2013-2017 Victor Valencia Rico.
@@ -8,4 +8,4 @@
88
* ========================================================================
99
*/
1010

11-
.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}
11+
.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}

0 commit comments

Comments
 (0)