Skip to content

Commit 5defa0d

Browse files
author
Rémi Becheras
committed
Merge upstream commit, build new dist with changes provided by fix #44, and release new patch : 0.7.1 -> 0.7.2
2 parents 87a11e0 + 431ba8e commit 5defa0d

13 files changed

+591
-188
lines changed

README.md

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
1-
angularjs-color-picker
2-
=====================
1+
# angularjs-color-picker
2+
33

44
AngularJS Color Picker Directive
55

6-
Installation
7-
=====
8-
* Get through bower
6+
## Installation
7+
8+
#### Bower
9+
10+
```shell
11+
bower install angularjs-color-picker --save
12+
```
13+
14+
#### Npm
915
```shell
10-
bower install angularjs-color-picker --save-dev
16+
npm install angularjs-color-picker --save
1117
```
1218

19+
#### Usage
20+
1321
* Include tinycolor.js, angularjs-color-picker.js and angularjs-color-picker.css
1422
```html
1523
<link rel="stylesheet" href="bower_components/angularjs-color-picker/angularjs-color-picker.min.css" />
1624

17-
<script src="bower_components/tinycolor/tinycolor"></script>
18-
<script src="bower_components/angularjs-color-picker/angularjs-color-picker.min.js"></script>
25+
<script src="bower_components/tinycolor/dist/tinycolor-min.js"></script>
26+
<script src="bower_components/angular-color-picker/angularjs-color-picker.min.js"></script>
1927
```
2028

2129

@@ -29,8 +37,8 @@ angular.module('app', ['color.picker']);
2937
<color-picker ng-model="myColor"></color-picker>
3038
```
3139

32-
Options
33-
=====
40+
## Options
41+
3442
If a list is given then choose one of the items. The first item in the list will be the default.
3543
```html
3644
<color-picker
@@ -46,16 +54,16 @@ If a list is given then choose one of the items. The first item in the list will
4654
></color-picker>
4755
```
4856

49-
Requirements
50-
=====
57+
## Requirements
58+
5159
* angularjs
5260
* bootstrap - looking at removing in future versions if requested enough (currently only used for styling the input text box)
53-
* tinycolor.js - looking at removing in future versions if requested enough (33kb not minified)
61+
* tinycolor.js (18.8 KB minified)
5462

5563
NO requirement for jQuery!
5664

57-
Inspiration
58-
=====
65+
## Inspiration
66+
5967
Inspiration and code taken from projects like
6068
* http://kaihenzler.github.io/angular-minicolors/
6169
* http://mjolnic.github.io/bootstrap-colorpicker/

angularjs-color-picker.css

Lines changed: 13 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)