fix line-height
Merge branch 'dev'