统一颜色；独立font；优化colorful方法
Merge branch 'master' of https://github.com/zedgu/fondant

Conflicts:
	app/fondant/styles/progress.styl