Skip to content

Commit

Permalink
added HSV panel
Browse files Browse the repository at this point in the history
added Grunt - minified js and css included
  • Loading branch information
istvan-ujjmeszaros committed Aug 11, 2014
1 parent 6fffa81 commit a3af31a
Show file tree
Hide file tree
Showing 59 changed files with 9,567 additions and 14,340 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file is for unifying the coding style for different editors and IDEs
# editorconfig.org

root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.DS_Store
.idea
.hg
.git
.hgignore
nbproject
index_demo_site.html

*.iml
*.ipr
*.iws
node_modules
bower_components
20 changes: 20 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"expr": true,
"immed": true,
"noarg": true,
"onevar": false,
"quotmark": "single",
"smarttabs": true,
"trailing": true,
"unused": true,
"node": true,
"globals": {
"$": true,
"jQuery": true,
"confirm": true
}
}
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: node_js
node_js:
- 0.10
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Contributing

Before sending a pull request remember to follow [jQuery Core Style Guide](http://contribute.jquery.org/style-guide/js/).

1. Fork it!
2. Create your feature branch: `git checkout -b my-new-feature`
3. Make your changes on the `src` folder, never on the `dist` folder.
4. Commit your changes: `git commit -m 'Add some feature'`
5. Push to the branch: `git push origin my-new-feature`
6. Submit a pull request :D
90 changes: 90 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
module.exports = function (grunt) {

grunt.initConfig({

// Import package manifest
pkg: grunt.file.readJSON("bootstrap-colorpickersliders.jquery.json"),

// Banner definitions
meta: {
banner: "/*\n" +
" * <%= pkg.title || pkg.name %> - v<%= pkg.version %>\n" +
" *\n" +
" * <%= pkg.description %>\n" +
" * <%= pkg.homepage %>\n" +
" *\n" +
" * Made by <%= pkg.author.name %>\n" +
" * Under <%= pkg.licenses[0].type %> License\n" +
" *\n" +
" * Requirements: " +
" *\n" +
" * TinyColor: https://github.com/bgrins/TinyColor/\n" +
" *\n" +
" * Using color math algorithms from EasyRGB Web site:/\n" +
" * http://www.easyrgb.com/index.php?X=MATH" +
" */\n"
},

// Concat definitions
concat: {
js: {
src: ["src/bootstrap.colorpickersliders.js"],
dest: "dist/bootstrap.colorpickersliders.js"
},
js2: {
src: ["src/bootstrap.colorpickersliders.nocielch.js"],
dest: "dist/bootstrap.colorpickersliders.nocielch.js"
},
css: {
src: ["src/bootstrap.colorpickersliders.css"],
dest: "dist/bootstrap.colorpickersliders.css"
},
options: {
banner: "<%= meta.banner %>"
}
},

// Lint definitions
jshint: {
files: ["src/bootstrap.colorpickersliders.js", "src/bootstrap.colorpickersliders.nocielch.js"],
options: {
jshintrc: ".jshintrc"
}
},

// Minify definitions
uglify: {
js: {
src: ["dist/bootstrap.colorpickersliders.js"],
dest: "dist/bootstrap.colorpickersliders.min.js"
},
js2: {
src: ["dist/bootstrap.colorpickersliders.nocielch.js"],
dest: "dist/bootstrap.colorpickersliders.nocielch.min.js"
},
options: {
banner: "<%= meta.banner %>"
}
},

cssmin: {
css: {
src: ["dist/bootstrap.colorpickersliders.css"],
dest: "dist/bootstrap.colorpickersliders.min.css"
},
options: {
banner: "<%= meta.banner %>"
}
}

});

grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-cssmin");

grunt.registerTask("default", ["jshint", "concat", "uglify", "cssmin"]);
grunt.registerTask("travis", ["jshint"]);

};
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Bootstrap Color Picker Sliders

A Bootstrap 3 optimized advanced responsive color selector with color swatches and support for human perceived lightness. Works in all modern browsers and on touch devices.
Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.

- https://github.com/istvan-meszaros/bootstrap-colorpickersliders
- http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/

Copyright 2013 István Ujj-Mészáros
Copyright 2014 István Ujj-Mészáros

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Bootstrap Color Picker Sliders

A Bootstrap 3 optimized advanced responsive color selector with color swatches and support for human perceived lightness. Works in all modern browsers and on touch devices.
Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.

- [Website](http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/)

Expand Down
60 changes: 30 additions & 30 deletions bootstrap-colorpickersliders.jquery.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"name": "bootstrap-colorpickersliders",
"title": "Bootstrap Color Picker Sliders",
"description": "A Bootstrap 3 optimized advanced responsive color selector with color swatches and support for human perceived lightness. Works in all modern browsers and on touch devices.",
"keywords": [
"colorpicker",
"bootstrap",
"input",
"responsive",
"color",
"picker",
"widget",
"colorchooser"
],
"version": "2.1.7",
"author": {
"name": "István Ujj-Mészáros",
"url": "https://github.com/istvan-ujjmeszaros"
},
"licenses": [
{
"type": "Apache License v2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0"
}
],
"homepage": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"demo": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"docs": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"download": "https://github.com/istvan-ujjmeszaros/bootstrap-colorpickersliders/archive/master.zip",
"dependencies": {
"jquery": ">=1.7"
"name": "bootstrap-colorpickersliders",
"title": "Bootstrap Color Picker Sliders",
"description": "Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.",
"keywords": [
"colorpicker",
"bootstrap",
"input",
"responsive",
"color",
"picker",
"widget",
"colorchooser"
],
"version": "3.0.0",
"author": {
"name": "István Ujj-Mészáros",
"url": "https://github.com/istvan-ujjmeszaros"
},
"licenses": [
{
"type": "Apache License v2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0"
}
],
"homepage": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"demo": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"docs": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"download": "https://github.com/istvan-ujjmeszaros/bootstrap-colorpickersliders/archive/master.zip",
"dependencies": {
"jquery": ">=1.7"
}
}
144 changes: 0 additions & 144 deletions bootstrap-colorpickersliders/bootstrap.colorpickersliders.css

This file was deleted.

Loading

0 comments on commit a3af31a

Please sign in to comment.