CON-1016

*DO NOT MERGE*
Please use box-sizing mixin.