added css func
Merge branch 'dev'