Add media query changes to demo and core file