Move the media-query out of the else and delete duplicated code.

Hey Stu, returning to this fantastic mixin and throwing in my two pence to improve the code.