font size to em
Merge branch 'hotfix/2.0.2'