fixed caret
Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
combine and simplify caret border widths