Zebra: Rebrace selectors

These classes were already extended, but are now expanded out for
readablity.
One unrelated comment change in calendar to remove an empty rule warning
in the test task.
Merge pull request #1759 from nschonni/remove-empty-SCSS-rules

Zebra: Rebrace selectors