up scss sidebar/navigation
Merge remote-tracking branch 'upstream/master'
up to master