v3.0.0/colors (deprecated)

.gitignore

@@ -7,6 +7,9 @@ Thumbs.db
 /ignore/
 /ignored/
 /node_modules/
+/bower_components/
 /nbproject/
+/.idea/
+/temp/
 static_server.js
 *.php

Gruntfile.js

@@ -1,6 +1,5 @@
 'use strict';
 module.exports = function(grunt) {
-
     grunt.initConfig({
         recess: {
             dist: {
@@ -26,49 +25,30 @@ module.exports = function(grunt) {
                 }
             }
         },
-        jshint: {
-            options: {
-                jshintrc: '.jshintrc'
-            },
-            files: [
-                'Gruntfile.js',
-                'src/js/commits.js',
-                'src/js/docs.js',
-                'dist/js/*.js'
-            ]
-        },
         jsbeautifier: {
-            htmlFiles: ['index.html'],
-            srcFiles: ['src/js/*.js'],
-            distFiles: ['dist/js/bootstrap-colorpicker.js']
-        },
-        combine: {
-            dist: {
-                input: 'src/js/colorpicker.js',
-                output: 'dist/js/bootstrap-colorpicker.js',
-                tokens: [{
-                        token: "'{{color}}';",
-                        file: 'src/js/colorpicker-color.js',
-                    }]
-            }
+            files: ['Gruntfile.js', 'src/js/*.js']
         },
         uglify: {
-            dist: {
+            distMin: {
+                options: {
+                    compress: true,
+                    beautify: false
+                },
                 files: {
                     'dist/js/bootstrap-colorpicker.min.js': [
-                        'dist/js/bootstrap-colorpicker.js'
+                        'src/js/colorpicker.js'
                     ]
                 }
-            }
-        },
-        bake: {
-            options: {
-                condense: true,
-                indent: 4
             },
             dist: {
+                options: {
+                    compress: false,
+                    beautify: true
+                },
                 files: {
-                    'index.html': ['src/docs.html']
+                    'dist/js/bootstrap-colorpicker.js': [
+                        'src/js/colorpicker.js'
+                    ]
                 }
             }
         },
@@ -83,18 +63,11 @@ module.exports = function(grunt) {
                 files: [
                     'src/js/*.js'
                 ],
-                tasks: ['jsbeautifier:srcFiles', 'combine', 'jsbeautifier:distFiles', 'uglify', 'jshint']
-            },
-            html: {
-                files: [
-                    'src/*.html'
-                ],
-                tasks: ['bake', 'jsbeautifier:htmlFiles']
+                tasks: ['uglify']
             }
         },
         clean: {
             dist: [
-                'index.html',
                 'dist/css',
                 'dist/js/*.js'
             ]
@@ -103,27 +76,20 @@ module.exports = function(grunt) {
 
     // Load tasks
     grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-bake');
     grunt.loadNpmTasks('grunt-recess');
     grunt.loadNpmTasks('grunt-jsbeautifier');
-    grunt.loadNpmTasks('grunt-combine');
 
     // Register tasks
     grunt.registerTask('default', [
         'clean',
         'recess',
-        'jsbeautifier:srcFiles',
-        'combine',
-        'jsbeautifier:distFiles',
-        'uglify',
-        'bake',
-        'jsbeautifier:htmlFiles'
+        'jsbeautifier',
+        'uglify'
     ]);
     grunt.registerTask('dev', [
         'watch'
     ]);
 
-};
+};

README.md

@@ -1,4 +1,4 @@
-# Bootstrap Colorpicker 2.0
+# Bootstrap Colorpicker 3.0
 
 [![Build Status](https://travis-ci.org/mjolnic/bootstrap-colorpicker.png)](https://travis-ci.org/mjolnic/bootstrap-colorpicker)
 
@@ -8,12 +8,10 @@ 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
-* Check that the index.html demos aren't broken (modify if necessary)
+* You may need to install the dependencies using bower
+* All the sources are compiled using Grunt, please do not modify dist/* files directly
+* If you modify the source code, please run grunt before commit
+* Check that the index.html demos aren't broken
 * Test your code at least in Chrome, Firefox and IE >= 9
 
 Thanks =)
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mjolnic/bootstrap-colorpicker/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

bower.json

@@ -1,15 +1,16 @@
 {
     "name": "mjolnic-bootstrap-colorpicker",
-    "version": "v2.0.0-rc",
+    "version": "3.0.0",
     "dependencies": {
-        "jquery": "^1.10",
-        "bootstrap": "^2"
+        "jquery": "^2.1",
+        "bootstrap": ">=3",
+        "tinycolor": ">=1.1"
     },
-		"ignore": [
-			"\\.*",
-			"/src",
-			"index.html",
-			"/package.json",
-			"/Gruntfile.js"
-		]
+    "ignore": [
+        "\\.*",
+        "/src",
+        "index.html",
+        "/package.json",
+        "/Gruntfile.js"
+    ]
 }