Clinton Blackburn 868d962002 Merge branch 'release' into release-2016-05-03-conflict

2016-05-04 20:01:29 -04:00

..

_email.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_instructor_2.scss

Merge branch 'release' into release-2016-05-03-conflict

2016-05-04 20:01:29 -04:00