typo css
fix color
Merge remote-tracking branch 'origin/master' into gh-pages