complete several css change
fix merge conflict of jiyaqi-several_small_change
Merge branch 'jiyaqi-several_small_change'