David Ormsbee eb96497cff Merge branch 'master' into feature/bk_forum_int ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt

2012-08-20 18:57:46 -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

courseware

Merge branch 'master' into feature/bk_forum_int

2012-08-20 18:57:46 -04:00

discussion

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

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

layout

moved global nav class

2012-08-14 16:12:36 -04:00

wiki

Fixed wiki circuit editor modal to be a little better styled.

2012-08-17 21:44:56 -04:00

_gradebook.scss

modified zebra stripes

2012-08-14 16:09:32 -04:00

_info.scss

Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav

2012-08-16 11:33:05 -04:00

_profile.scss

Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav

2012-08-16 11:33:05 -04:00

_textbook.scss

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

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