put the button styles inside the base.css
Merge branch 'dev'