Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

41 Commits

Author SHA1 Message Date
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-19 16:00:27 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Brian Talbot
be13bc6026 added in completed course status to dashboard and certificate availability states 2012-11-09 18:18:36 -05:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
a15ef161a9 ff bug fix 2012-10-03 10:59:24 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -04:00
Calen Pennington
4381674ec5 Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms 2012-10-01 15:17:40 -04:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Kyle Fiedler
8fa8450fbf Added color to span and removed width from bottom sequence navigation 2012-09-14 16:13:37 -04:00
Kyle Fiedler
da87af5351 Fix missplaced k 2012-09-12 16:37:41 -04:00
Kyle Fiedler
b6e03c60b6 Added back the ie fixes from before 2012-09-12 16:01:39 -04:00
Tom Giannattasio
5841bdcef0 tweaking loading animation so that it removes more smoothly 2012-09-10 12:11:01 -07:00
Tom Giannattasio
925caac649 mark styling added 2012-09-05 10:19:24 -04:00
Tom Giannattasio
da413f6de8 added sticky sidebar 2012-08-30 16:37:22 -04:00
Tom Giannattasio
d75bb87bdd started adding updated styles 2012-08-29 13:22:55 -04:00
Tom Giannattasio
885efc47c4 darker background for increased contrast 2012-08-22 09:03:38 -04:00
Tom Giannattasio
ad5fcbe784 new header styles 2012-08-21 14:46:35 -04:00
Tom Giannattasio
3ffcb2615f fix merge conflicts 2012-08-20 18:07:32 -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
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
Tom Giannattasio
538185173a added truncation for super long titles 2012-08-10 11:48:07 -04:00
Tom Giannattasio
022c65a6b4 fixed class name header bug 2012-08-10 11:40:16 -04:00
Kyle Fiedler
b90aa2e2db Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class 2012-08-01 17:36:11 -04:00
Kyle Fiedler
6c3ec99f9e Start to change to ems and remove all of cream 2012-08-01 17:36:10 -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
6cad5459b3 Start to refactor courseware scss 2012-07-30 17:37:11 -04:00
kimth
6631848b53 CodeMirror fix in the new scss org 2012-07-26 10:49:10 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -04:00
Kyle Fiedler
6da83900aa Added min width for container 2012-07-23 13:56:44 -04:00
Kyle Fiedler
b557363ac2 Added som fixed for fluid design 2012-07-23 13:56:44 -04:00
Kyle Fiedler
e6465e420a Changed around the css 2012-07-23 12:38:21 -04:00
Kyle Fiedler
28aaa88923 Make site fluid, add new homepage image 2012-07-20 13:43:32 -04:00
Kyle Fiedler
c7e43d98dc Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case 2012-07-20 11:18:39 -04:00
Galen Frechette
00e366e9f8 improves the already registed message on the course about page 2012-07-19 02:36:42 -04:00
Galen Frechette
d55cd78c73 updates and imporves design of the home page header 2012-07-17 12:56:29 -04:00
Galen Frechette
767469381b renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling 2012-07-16 22:23:43 -04:00
Matthew Mongeau
47126dc686 wip 2012-06-13 14:50:25 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00