Bridger Maxwell e655b4a3b3 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki ...

Conflicts:
	cms/static/sass/_base.scss
	repo-requirements.txt

2012-08-21 22:25:21 -04:00

..

base

Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red

2012-08-20 15:45:05 -04:00

bourbon

redesigns course item on home page and find courses page, refactors its implimentation and makes vrious other design improvements

2012-06-26 23:26:12 -04:00

course

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-21 22:25:21 -04:00

multicourse

Merge remote-tracking branch 'origin/hotfix/1.0.4'

2012-08-21 14:56:35 -04:00

shared

Added more fixes for askbot also fixed some of the extra padding

2012-08-15 13:51:10 -04:00

_discussion.scss

slight behavior change

2012-08-19 10:44:05 -07:00

_news.scss

merge with origin master

2012-08-01 14:24:46 -04:00

.gitignore

Allow for modular css from XModules, and split capa module css out as a test

2012-07-24 16:14:04 -04:00

application.scss

Merge branch 'master' of github.com:MITx/mitx into discussion2

2012-08-01 18:07:52 -04:00

course.scss

Adding comments about removing the syllabus tab ASAP.

2012-08-21 13:25:29 -07:00

ie.scss

More small ie fixes

2012-07-23 17:49:48 -04:00