diff --git a/.gitignore b/.gitignore index 4fec79a8..bfb73d94 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ Thumbs.db *.log /ignore* /node_modules/ +/bower_components/ /nbproject/ static_server.js *.php diff --git a/README.md b/README.md index 4f3233b6..7f14ceb3 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Read the documentation [here](http://mjolnic.github.io/bootstrap-colorpicker/) ## Contributing * All the sources are compiled using Grunt, please do not modify dist files directly -* If you modify some source code, please recompile the project dist files +* If you modify some source code, please recompile the project dist files (running grunt) * Check that the index.html demos aren't broken (modify if necessary) * Test your code at least in Chrome, Firefox and IE >= 10 diff --git a/bower.json b/bower.json index d5f53320..12cbbef8 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "mjolnic-bootstrap-colorpicker", - "version": "2.1.0", + "version": "2.1.1", "main": [ "dist/css/bootstrap-colorpicker.css", "dist/js/bootstrap-colorpicker.js" diff --git a/composer.json b/composer.json index 79a0dbb8..366b204b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "mjolnic/bootstrap-colorpicker", - "description": "Colorpicker plugin for Twitter Bootstrap, originally written by Stefan Petre", + "description": "A nice and customizable colorpicker plugin for Twitter Bootstrap 2 and 3", "license": "Licensed under the Apache License, Version 2.0", "authors": [ { diff --git a/index.html b/index.html index a183a799..b4b91d96 100644 --- a/index.html +++ b/index.html @@ -232,22 +232,19 @@

Options

sliders object - [...] - + [...] Vertical sliders configuration (read source code if you really need to tweak this). slidersHorz object - [...] - + [...] Horizontal sliders configuration (read source code if you really need to tweak this). template string - [...] - + [...] Customizes the default colorpicker HTML template.