applied efaf55b894 and fea3338304 changes to scss files