fix chrome style problem
Merge branch 'dev'