update css
Merge branch 'dev' into gh-pages

* dev:
  update css