修改other.sass
Merge remote-tracking branch 'origin/zhanghan' into frontend