Merge pull request #379 from cvogeley/master

Well, if you want to add a color picker it is indeed a good idea
This commit is contained in:
RedMatrix
2014-03-26 06:37:47 +11:00
28 changed files with 3249 additions and 1 deletions

View File

@@ -15,5 +15,5 @@ head_add_js('library/bootstrap-datetimepicker/js/moment.js');
head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
head_add_js('library/bootstrap-colorpicker/src/js/docs.js');
//head_add_js('library/bootstrap-colorpicker/src/js/docs.js');