changed media query name
Merge branch 'feature'