Update style.scss

merging in x changes to .css