Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

790 Commits

Author SHA1 Message Date
Arjun Singh
99703761b0 Merge master 2012-08-21 12:01:09 -07:00
Tom Giannattasio
557975458c Merge branch 'master' into feature/tomg/fall-design 2012-08-21 14:50:15 -04:00
Tom Giannattasio
ad5fcbe784 new header styles 2012-08-21 14:46:35 -04:00
Kyle Fiedler
f68a97a63f Added changes to wiki 404 and fixed CMS Sass 2012-08-21 13:54:58 -04:00
Tom Giannattasio
4e6d7babcc fixed wiki bugs; started sequence nav bugs 2012-08-21 12:51:33 -04:00
Tom Giannattasio
fafb443484 fixed wiki styles 2012-08-21 09:24:55 -04:00
Arjun Singh
1cfed46d06 Adding a syllabus page (accessible via course navigation) 2012-08-21 05:47:26 -07:00
Tom Giannattasio
ed1bac7629 fixed container padding and sidebar fades 2012-08-21 08:28:24 -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
88d514e28d fixed merge conflict in extends 2012-08-20 18:15:09 -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
Kyle Fiedler
ab28e08591 Added new button classes 2012-08-20 13:22:21 -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
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07: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
Bridger Maxwell
1470045b74 Fixed wiki circuit editor modal to be a little better styled. 2012-08-17 21:44:56 -04:00
Bridger Maxwell
a4b97c5f10 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 21:44:05 -04:00
Kyle Fiedler
8473188fea Added new styles for sequence nav and reset some of the styles for inputs 2012-08-17 17:41:45 -04:00
Tom Giannattasio
a2d0ada82c styled settings page 2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Tom Giannattasio
b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:34:38 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
Kyle Fiedler
ad7061e41f 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
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-16 07:31:56 -07:00
Tom Giannattasio
13c2bb588e added styles for main article, sidebar and breadcrumb 2012-08-15 15:59:46 -04:00
Kyle Fiedler
6d7225bebb Added some final touches to askbot 2012-08-15 13:51:10 -04:00
Kyle Fiedler
ff1f090737 Added more fixes for askbot also fixed some of the extra padding 2012-08-15 13:51:10 -04:00
Kyle Fiedler
0804ff7a75 Added styles for single question and profile view 2012-08-15 13:51:10 -04:00
Kyle Fiedler
bbe9432508 Lots of askbot fixes 2012-08-15 13:51:10 -04:00
Tom Giannattasio
8daea9c465 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 13:11:00 -04:00
Tom Giannattasio
abf26dced9 started styles 2012-08-15 13:10:47 -04:00
Rocky Duan
449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-14 17:48:08 -07:00
Tom Giannattasio
a58a047582 moved global nav class 2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51 modified zebra stripes 2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00