删除判断 位置样式
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/styles/nav.css