详细页面样式调整
Merge branch 'master' of https://github.com/heshaohua/zerospaces

Conflicts:
	public/css/style.css
solved