Address margins on .navbar-right to fix #13325 #13464.

This commit follows f9fde56.
Hehe, right, that's a placeholder for a comment I'll write if we agree this fix is the way to go.