addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable