refactor navbar file to better nest css and restore navbar-color to navbar text (fixes #9500)