修改导航样式
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php111
	style.css
	templates/content-single.php