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