Removed :after and :before from css
Merge branch 'master' into gh-pages

* master:
  Removed :after and :before from css