CLC-3715: Fix styling for disabled buttons
https://jira.ets.berkeley.edu/jira/browse/CLC-3715
Merge pull request #2488 from christianv/CLC-3715

CLC-3715: Fix styling for disabled buttons