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

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-14 12:54:43 -07:00

..

base

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -04:00

courseware

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

2012-08-14 12:54:43 -07:00

discussion

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -04:00

layout

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

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

wiki

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -04:00

_gradebook.scss

Moved files and removed files

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

_info.scss

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -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

cleaned up textbook nav styles

2012-08-09 14:44:50 -04:00