fixed syntax error in style.css
Merge branch 'v1.2.1' into develop
Merge branch 'develop'