Revert "fixed the font size conflict with bootstrap's css"

This reverts commit 151d69b81dc50222669a2796cb8e0d6c18afaaf7.
fixed the font size conflict with bootstrap's css
Merge branch 'master' into gh-pages