added and updated mixins for scss