Revert "fixed conflicts in navbar.css.scss"

This reverts commit 65f9c5416d090ec37f51db5f6985c5c1bbeb56d3, reversing
changes made to f855b282de0cb990cb8c15a5184eeddd113b863d.