Rocky Duan 2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/urls.py

2012-08-07 16:58:14 -04:00

..

base

Make the modal window work in the courseware

2012-08-07 11:59:49 -04:00

courseware

error styles

2012-08-07 14:31:04 -04:00

discussion

Start to change to ems and remove all of cream

2012-08-01 17:36:10 -04:00

layout

Added some styles for the top navigation and for the sidebar navigation

2012-07-31 16:29:01 -04:00

wiki

Add images for book and fix styles for wiki

2012-08-06 16:08:40 -04:00

_gradebook.scss

Moved files and removed files

2012-07-30 17:37:53 -04:00

_info.scss

Reset styles for profile page and some for the info page

2012-08-06 16:08:41 -04:00

_profile.scss

Reset styles for profile page and some for the info page

2012-08-06 16:08:41 -04:00

_textbook.scss

Add styles for next last page in textbook

2012-08-06 16:08:40 -04:00