Anton Stupak
65aa7d4f2e
Fixes bug with Fullscreen mode and more.
...
Fixes subtitles hiding on slidermove and their height.
2013-08-01 20:50:16 +03:00
Frances Botsford
4187090dac
removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set
2013-07-10 09:17:59 -04:00
David Baumgold
41374838cb
Changed @include border-radius() to border-radius
...
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
2013-07-10 09:17:58 -04:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Alexander Kryklia
059b9f66e3
poll and conditional finished
2013-02-15 18:48:39 +02:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -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
2b55c5906d
css tweaks
2012-11-12 13:09:16 -05:00
Victor Shnayder
fb3b52b99f
refactor + style self-assessment in progress
2012-11-08 18:01:09 -05:00
Calen Pennington
05b9e6cab2
Standardize more of css between lms and cms
2012-10-01 15:17:40 -04:00
Tom Giannattasio
4af134b28a
fixed large collapsible text and triple toggle
2012-09-20 17:49:36 -04:00
Kyle Fiedler
5c76a1fbaf
Added fix for sequence nav in vertical
2012-09-13 11:24:07 -04:00
Kyle Fiedler
1dceff78b5
Fix alignment in tables for ie
2012-09-12 16:01:38 -04:00
Kyle Fiedler
ec9521a9f5
removed list bullets from tutorials
2012-09-12 13:01:10 -04:00
Kyle Fiedler
3fd640aef3
Removed display none for histogram
2012-09-11 10:22:03 -04:00
Kyle Fiedler
54caa320ef
fixed list items in html in the courseware
2012-09-06 10:21:33 -04:00
Tom Giannattasio
2c1571d66c
applied line height to course content wrapper to avoid strange line heights with improper markup
2012-08-23 10:04:00 -04:00
Tom Giannattasio
bd536f8aec
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 18:13:40 -04:00
Kyle Fiedler
3273de93fe
make tutorial headers normal size
2012-08-21 16:01:48 -04:00
Tom Giannattasio
557975458c
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 14:50:15 -04:00
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
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
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
