fixes issue of `border-box` sizing (#403)
Merge branch 'dev' into edge