Consolidate media queries