Remove html from master mixins.scss

Had additional class for rtl, and some changes where left in merge
conflict results
Merge pull request #1124 from nschonni/remove-html-from-mixins-scss-master

Move html elements from master mixins.scss