Tom Giannattasio
|
4e6d7babcc
|
fixed wiki bugs; started sequence nav bugs
|
2012-08-21 12:51:33 -04:00 |
|
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 |
|
Tom Giannattasio
|
3ffcb2615f
|
fix merge conflicts
|
2012-08-20 18:07:32 -04:00 |
|
Tom Giannattasio
|
a1ff34571e
|
sequence nav changes were lost?! temporary fix
|
2012-08-20 18:01:57 -04:00 |
|
Tom Giannattasio
|
ee92ba0752
|
new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch
|
2012-08-20 17:56:51 -04:00 |
|
Tom Giannattasio
|
0f6c31b4bd
|
started courseware sidebar styling
|
2012-08-20 15:51:10 -04:00 |
|
Kyle Fiedler
|
20d9e6e86d
|
Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red
|
2012-08-20 15:45:05 -04:00 |
|
Tom Giannattasio
|
16190843e7
|
started reworking sidebar styles
|
2012-08-20 13:56:51 -04:00 |
|
Tom Giannattasio
|
e9e6b1828e
|
new header styles
|
2012-08-20 10:41:34 -04:00 |
|
Tom Giannattasio
|
8b4b1fddb5
|
added new wrapper styles
|
2012-08-20 10:15:28 -04:00 |
|
Tom Giannattasio
|
3b02e6a1ee
|
started new nav styles
|
2012-08-20 09:02:18 -04:00 |
|
Rocky Duan
|
028bd23c1c
|
Merge branch 'master' of github.com:MITx/mitx into profile
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
|
2012-08-18 16:57:00 -07:00 |
|
Kyle Fiedler
|
ff1f090737
|
Added more fixes for askbot also fixed some of the extra padding
|
2012-08-15 13:51:10 -04:00 |
|
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 |
|
Kyle Fiedler
|
731f1cd7a8
|
Added tooltip styles, made all buttons the same, and other small changes throughout the courseware
|
2012-08-13 15:05:43 -04:00 |
|
Brittany Cheng
|
5b6e3997af
|
fixed ul courseware
|
2012-08-10 17:58:18 -07:00 |
|
Kyle Fiedler
|
ccc1f1dfd5
|
Removed padding and added line-height for the tutorials
|
2012-08-08 16:27:48 -04:00 |
|
Kyle Fiedler
|
17d072711b
|
Make the sidebar links more standard, and remove some of their styling
|
2012-08-08 16:27:47 -04:00 |
|
Brittany Cheng
|
ed8595ad95
|
error styles
|
2012-08-07 14:31:04 -04:00 |
|
Rocky Duan
|
2811f50466
|
hide the annoying staff info for now
|
2012-08-02 15:15:35 -04:00 |
|
Kyle Fiedler
|
cdd37eeb92
|
Strip down sequence navigaiton and more stripping of the courseware nav
|
2012-08-01 17:36:10 -04:00 |
|
Kyle Fiedler
|
9d14033f6b
|
Added some styles for the top navigation and for the sidebar navigation
|
2012-07-31 16:29:01 -04:00 |
|
Kyle Fiedler
|
d30ae5389e
|
Added fix for videos start to zero out colors and mit styles
|
2012-07-31 14:18:42 -04:00 |
|
Kyle Fiedler
|
7ab5bbfaef
|
Moved files and removed files
|
2012-07-30 17:37:53 -04:00 |
|