more specific selector in media query to override original style
Merge branch 'master' into gh-pages