Dennis Jen d2660e530f Merge branch 'release' ...

Conflicts:
	lms/templates/verify_student/make_payment_step.underscore

2015-01-08 15:02:26 -05:00

..

_decoupled-verification.scss

ECOM-869 Update copy and hide supplementary content wrapper and requirement blocks if user is inactive

2015-01-05 15:31:36 -05:00

_login-register.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

_shoppingcart.scss

cleanup to PR feedback for shoppingcart and instructor2 scss partials

2015-01-05 18:57:58 -05:00

_verification.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