fix colorPicker
Merge branch 'master' of https://github.com/pug-by/project1
Merge branch 'master' of https://github.com/pug-by/project1