Refactored HTML input addon

Avoids upcoming SASS variable rescoping issues and repetitive code. Based of #290 - just adapting code to adhere to the style guide.

Also adding a refactored version of the button-input from #292.