added optional border arg to button-solid mixin