added variable scss file and added drop shadow to map
fixed merge conflicts