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

355 Commits

Author SHA1 Message Date
Diana Huang
093560e859 Updates to copy and styling and a few bugfixes 2013-01-04 16:36:28 -05:00
Diana Huang
fa09e25a1a Add interstitial page between calibration and grading. 
Make individual Prompt and Rubric Sections hideable.
 2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626 Improvements to calibration feedback step 2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback. 
Also, allow for the hiding of the Prompt and the Rubric.
 2013-01-04 12:42:38 -05:00
Diana Huang
b5f34a9da6 Show special text when calibrating or when grading. 2013-01-04 11:03:24 -05:00
Diana Huang
078b2a5b95 Fix up some minor state issues and 
complete basic JS functionality for page
 2013-01-03 16:19:04 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages 
and the problem list page
 2013-01-02 15:01:59 -05:00
Diana Huang
3156c2b393 Add icon to the grading message 2012-12-10 12:29:46 -05:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
Diana Huang
5030c9d35b Cleanup of the meta information styles and make 
the feedback box less important.
 2012-12-07 17:01:27 -05:00
Diana Huang
1026c64111 Fix up some more of the meta info container 2012-12-07 17:01:27 -05:00
Diana Huang
aee1e5e9a9 Updates to the list view and error container 2012-12-07 17:01:27 -05:00
Diana Huang
ffa42b6f11 Styles for the new instructor grading interface 2012-12-07 17:01:27 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Victor Shnayder
d2cc8696ed Add some initial css. 2012-11-30 10:03:31 -05:00
Carlos Andrés Rocha
d4f5f17381 Remove unused askbot/discussion sass stylesheets 
The unused styles are referencing images that no longer exisit,
breaking collectstatic and therefore tests.
 2012-11-27 19:06:03 -05:00
David Ormsbee
658c92037c Revert "Make tests pass again without askbot" -- that commit removed 
scss files that were still being partially used by the current
discussion forum.

This reverts commit 010bccc8a5.
 2012-11-20 18:43:00 -05:00
Calen Pennington
010bccc8a5 Make tests pass again without askbot 2012-11-19 16:02:49 -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
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -05:00
Victor Shnayder
6a313fd562 more css tweaks 2012-11-12 13:17:26 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
2b55c5906d css tweaks 2012-11-12 13:09:16 -05:00
Brian Talbot
c6bfb67b1a revised no certificate state for dashboard messages and removed course message UI for future work on separate branch 2012-11-09 18:18:36 -05:00
Brian Talbot
d155869f16 added in course-wide completion message static states and styling 2012-11-09 18:18:36 -05:00
Victor Shnayder
fb3b52b99f refactor + style self-assessment in progress 2012-11-08 18:01:09 -05:00
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04: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
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Tom Giannattasio
1870db5fb1 fixed custom tab box-sizing glitch in firefox 2012-10-01 10:09:56 -04:00
Arjun Singh
95997a5e67 fix up syllabus 2012-09-24 04:32:36 -07:00
arjun810
df2b06f235 Merge pull request #760 from MITx/kimth/fix-gradebook 
Kimth/fix gradebook
 2012-09-23 22:17:43 -07:00
Arjun Singh
f86933de4f Increase height of progress graph; allows for more cutoffs to look reasonable 2012-09-23 20:53:38 -07:00
Arjun Singh
5e49871e93 cs188 styling 2012-09-22 22:54:41 -07:00
Arjun Singh
38c0a034fb Add slides nowrap 2012-09-22 18:06:19 -07:00
Arjun Singh
eca21e7c18 Fix syllabus in static_tab_wrapper; don't wrap slides 2012-09-22 17:46:35 -07:00
Arjun Singh
015328ed5c more 188 styling 2012-09-22 17:19:27 -07:00
Arjun Singh
987d8ea43b Some 188-specific styling + default styling for static tabs 2012-09-22 14:17:34 -07:00
Tom Giannattasio
4af134b28a fixed large collapsible text and triple toggle 2012-09-20 17:49:36 -04:00
Tom Giannattasio
99a009abdf tweaked sound lab styles 2012-09-20 15:54:09 -04:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
kimth
81e01c8c72 Bring back bullets in lists 2012-09-13 16:46:19 -04:00
kimth
26158e78ea Merge pull request #682 from MITx/feature/kfiedler/updates 
Update styles for the info updates
 2012-09-13 12:45:43 -07:00
Kyle Fiedler
e0e94ee1f1 A little more space for each list 2012-09-13 15:23:46 -04:00
Kyle Fiedler
15ffd7e01d Better styles for updates 2012-09-13 15:13:42 -04:00