Variable way to declare .btn-x .caret border color

It also remove nested ```.caret``` for #11085.