Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #778 from MITx/hotfix/arjun/mc_style

Browse Source 
Fixes multiple choice styling
This commit is contained in:
kimth
2012-09-27 13:41:20 -07:00
parent eb8cef9308 71923e7c1f
commit f93115ee4d
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/lib/capa/capa/templates/choicegroup.html
View File

@@ -1,13 +1,15 @@
<form class="choicegroup capa_inputtype" id="inputtype_${id}">
% if state == 'unsubmitted':
<span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'correct':
<span class="correct" id="status_${id}"></span>
% elif state == 'incorrect':
<span class="incorrect" id="status_${id}"></span>
% elif state == 'incomplete':
<span class="incorrect" id="status_${id}"></span>
% endif
<div class="indicator_container">
% if state == 'unsubmitted':
<span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'correct':
<span class="correct" id="status_${id}"></span>
% elif state == 'incorrect':
<span class="incorrect" id="status_${id}"></span>
% elif state == 'incomplete':
<span class="incorrect" id="status_${id}"></span>
% endif
</div>
<fieldset>
% for choice_id, choice_description in choices:

19
common/lib/xmodule/xmodule/css/capa/display.scss
View File

@@ -38,22 +38,27 @@ section.problem {
.choicegroup {
@include clearfix;
label.choicegroup_correct:after {
content: url('../images/correct-icon.png');
label.choicegroup_correct{
text:after{
content: url('../images/correct-icon.png');
}
}
> span {
padding-right: 20px;
min-width:100px;
width: auto !important;
width: 100px;
.indicator_container {
float: left;
background-position: 0 0 !important;
width: 25px;
margin-right: 15px;
}
fieldset {
@include box-sizing(border-box);
float: left;
border-left: 1px solid #ddd;
padding-left: 20px;
margin: 20px 0;
margin: 0px 0px 20px;
}
input[type="radio"],

2
run_watch_data.py
View File

@@ -17,7 +17,7 @@ from watchdog.events import LoggingEventHandler, FileSystemEventHandler
# watch fewer or more extensions, you can change EXTENSIONS. To watch all
# extensions, add "*" to EXTENSIONS.
WATCH_DIRS = ["../data", "common/lib/xmodule/xmodule/js"]
WATCH_DIRS = ["../data", "common/lib/xmodule/xmodule/js", "common/lib/xmodule/xmodule/css"]
EXTENSIONS = ["*", "xml", "js", "css", "coffee", "scss", "html"]
WATCH_DIRS = [os.path.abspath(os.path.normpath(dir)) for dir in WATCH_DIRS]