Merge
Merge pull request #1585 from darkwing/slim-mixin-classes

Moving some mixin classes to mixin functions to cut down on repeated CSS