Kyle Fiedler 162fa59441 Merge branch 'master' into pmitros/name-change ...

Conflicts:
	static/css/application.css
	static/css/marketing.css

2012-03-29 11:08:41 -04:00

..

_calculator.scss

Fixed bug with the calculator

2012-03-28 15:09:05 -04:00

_footer.scss

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

_header.scss

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

_layout.scss

Added fix for sequence nav bug

2012-03-28 14:56:32 -04:00

_leanmodal.scss

Added a fake deactivate and unenroll links and some style for profile

2012-03-22 15:32:31 -04:00