Skip to content

Commit

Permalink
Is added to support multiple versions of FontAwesome
Browse files Browse the repository at this point in the history
  • Loading branch information
victor-valencia committed Oct 16, 2014
1 parent 2096152 commit d0f3e2b
Show file tree
Hide file tree
Showing 13 changed files with 1,757 additions and 571 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 victor-valencia
Copyright (c) 2014 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
42 changes: 27 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,49 @@
bootstrap-iconpicker
====================

##Bootstrap-Iconpicker v1.0.1
![Iconpicker](bootstrap-iconpicker.png)

A simple iconpicker.

See live examples here: <a href="http://victor-valencia.github.io/bootstrap-iconpicker">http://victor-valencia.github.io/bootstrap-iconpicker</a>

Please note that this project is for <a href="http://getbootstrap.com/"><strong>Bootstrap 3</strong></a>, including Glyphicons or <a href="http://fontawesome.io/"><strong>Font Awesome Icons</strong></a> .

================

## Contributors
Please note that this project is for <a href="http://getbootstrap.com/"><strong>Bootstrap 3.2</strong></a>, including Glyphicons or <a href="http://fontawesome.io/"><strong>Font Awesome Icons</strong></a> .

@[victor-valencia](https://github.com/victor-valencia), @[promatik](https://github.com/promatik), @[jwhitfieldseed](https://github.com/jwhitfieldseed)
##1.- Configuration (Glyphicon):
1.1.- Add the style file bootstrap-iconpicker.min.css

```
<link rel="stylesheet" href="bootstrap-iconpicker/css/bootstrap-iconpicker.min.css"/>
```

================
1.2.- Add the javascript file bootstrap-iconpicker.min.js

## Configuration:
```
<script type="text/javascript" src="bootstrap-iconpicker/js/bootstrap-iconpicker.min.js"></script>
```

1.- Add the style file bootstrap-iconpicker.min.css
##2.- Configuration (Font Awesome 4.2.0):
2.1.- Add the style file bootstrap-iconpicker.min.css and Font Awesome style file font-awesome.min.css

```
<link rel="stylesheet" href="bootstrap-iconpicker/css/bootstrap-iconpicker.min.css">
<link rel="stylesheet" href="bootstrap-iconpicker/css/bootstrap-iconpicker.min.css"/>
<link rel="stylesheet" href="font-awesome-4.2.0/css/font-awesome.min.css"/>
```

2.- Add the javascript file bootstrap-iconpicker.min.js
2.2.- Add the Font Awesome icon names file fa-icon-names-4.2.0.min.js and javascript file bootstrap-iconpicker.min.js

```
<script type="text/javascript" src="bootstrap-iconpicker/js/font-awesome/fa-icon-names-4.2.0.min.js"></script>
<script type="text/javascript" src="bootstrap-iconpicker/js/bootstrap-iconpicker.min.js"></script>
```

================
##Changelog
- v1.0.0 - Version initial.
- v1.0.1 - Is added to support multiple versions of FontAwesome

##Author
@[victor-valencia](https://github.com/victor-valencia)

##Contributors
@[victor-valencia](https://github.com/victor-valencia), @[promatik](https://github.com/promatik), @[jwhitfieldseed](https://github.com/jwhitfieldseed)

##License
Licensed under The MIT License.
4 changes: 2 additions & 2 deletions bootstrap-iconpicker/css/bootstrap-iconpicker.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap-iconpicker v1.0.0
* Bootstrap-iconpicker v1.0.1
*
* Copyright 2013 Victor Valencia Rico.
* Copyright 2014 Victor Valencia Rico.
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
Expand Down
4 changes: 2 additions & 2 deletions bootstrap-iconpicker/css/bootstrap-iconpicker.min.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap-iconpicker v1.0.0
* Bootstrap-iconpicker v1.0.1
*
* Copyright 2013 Victor Valencia Rico.
* Copyright 2014 Victor Valencia Rico.
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
Expand Down
Loading

0 comments on commit d0f3e2b

Please sign in to comment.