Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,799 Commits 1 Branch 0 Tags
a7103ff8932ddfdcd10e844aa71fd3901690de47
Commit Graph

170 Commits

Author SHA1 Message Date
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
b5b0d08621 Sorta fix askbot 2012-07-31 16:29:01 -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
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
David Ormsbee
e5fd92630d Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors 
Added styles for errors
 2012-07-30 15:24:12 -07:00
Kyle Fiedler
c611bd9228 added treeview 2012-07-30 17:39:44 -04:00
Kyle Fiedler
257ce0430f Moved vendor sass files to css folder and included them in 2012-07-30 17:39:19 -04:00
Kyle Fiedler
7ab5bbfaef Moved files and removed files 2012-07-30 17:37:53 -04:00
Kyle Fiedler
6cad5459b3 Start to refactor courseware scss 2012-07-30 17:37:11 -04:00
Kyle Fiedler
3bb82c41d2 Remove couse css file 2012-07-30 16:21:03 -04:00
Kyle Fiedler
a040f4346e Added styles for errors 2012-07-30 11:57:31 -04:00
Kyle Fiedler
d94fd1542d Added Gemfile.lock to ignore 2012-07-30 09:50:24 -04:00
kimth
6631848b53 CodeMirror fix in the new scss org 2012-07-26 10:49:10 -04:00
Calen Pennington
73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-26 09:05:57 -04:00
Kyle Fiedler
8c079c8a72 Added styles for course images to always the right dimentions 2012-07-25 18:18:52 -04:00
Arjun Singh
cdea9488ef Fixing up bracket indentation 2012-07-25 15:58:14 -04:00
Kyle Fiedler
bb3dfc5c08 fix courseware css file so it imports the right files in the right order 2012-07-25 15:54:18 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Calen Pennington
d8f8d8c656 Merge branch 'release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
 2012-07-24 08:52:50 -04:00
Kyle Fiedler
3008c17730 Added bottom margin for articles in help 2012-07-23 19:19:50 -04:00
Kyle Fiedler
18ec7ca8e8 Added social links to the footer of the press release 2012-07-23 19:17:22 -04:00
Kyle Fiedler
6aac776a33 Added styles for help page 2012-07-23 18:40:58 -04:00
Kyle Fiedler
2cb9e2997e Move the shiv back to the header 2012-07-23 18:22:21 -04:00
Kyle Fiedler
63faa76e2a More small ie fixes 2012-07-23 17:49:48 -04:00
Kyle Fiedler
0f4976e069 Added some small IE fixes 2012-07-23 16:53:39 -04:00
David Ormsbee
64ecd3a211 Merge pull request #275 from MITx/uc_berkeley_press 
Added contact info on Berkeley press release.
 2012-07-23 12:52:16 -07:00
Bridger Maxwell
e1ad3539b6 Updated contact information on press release. 2012-07-23 15:40:10 -04:00
Kyle Fiedler
b4d08f820e Chage placement of the read more link 2012-07-23 15:28:24 -04:00
Bridger Maxwell
f6b4475309 Added contact info on Berkeley press release. 2012-07-23 15:22:06 -04:00
Kyle Fiedler
c2b426afeb prereqs float right 2012-07-23 15:14:04 -04:00
David Ormsbee
40aaaeda25 Merge pull request #254 from MITx/uc_berkeley_press 
UC berkeley press
 2012-07-23 11:46:44 -07:00
Calen Pennington
7ef8b6ac1e Merge remote-tracking branch 'origin/release/1.0' 2012-07-23 14:27:29 -04:00
Kyle Fiedler
54516a9560 Fix grid and make sure that everything is fluid 2012-07-23 13:56:44 -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
Calen Pennington
ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-23 13:55:20 -04:00
Bridger Maxwell
863071c9a5 Merge remote-tracking branch 'origin/release/1.0' into uc_berkeley_press 
Conflicts:
	lms/urls.py
 2012-07-23 13:44:04 -04:00
Kyle Fiedler
e6465e420a Changed around the css 2012-07-23 12:38:21 -04:00
Kyle Fiedler
8eeeac716b Added some design changes to the homepage header 2012-07-23 12:06:17 -04:00
David Ormsbee
074fc24343 Fix up the signup modal for registration for the new fields. 2012-07-22 18:53:12 -04:00
Bridger Maxwell
ed10dc43d9 Added UC Berkeley press release. Moved press releases to their own folder. 2012-07-22 17:35:10 -04:00
David Ormsbee
fa51046949 Merge pull request #253 from MITx/smooth_registration 
Smooth registration
 2012-07-22 13:49:59 -07:00