merge from mapjs
changes to colorpicker css