Simplify media queries, stop relying on media type
Merge pull request #1048 from guardian/simplify-media-queries

Simplify media queries, stop relying on media type
Merge branch 'master' of github.com:guardian/frontend into expander-vertical-centering

Conflicts:
	common/app/assets/stylesheets/state/_state.scss