Skip to content

E
edx-ora2
Commit 93238bcf by Muzaffar yousaf
Options

Merge pull request #636 from edx/muzaffar/tnl814-multiline-issue-ux 

fixed the multi-line issue for criterion prompt, criterion option text,
parents ba7136c4 e7216747
Showing with 17 additions and 8 deletions
openassessment/templates/openassessmentblock/grade/oa_grade_complete.html
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
</h6> </h6>
<div class="feedback__value"> <div class="feedback__value">
{{ feedback }} <p class="feedback__value__raw">{{ feedback }}</p>
</div> </div>
</li> </li>
{% endfor %} {% endfor %}
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
</h6> </h6>
<div class="feedback__value"> <div class="feedback__value">
{{ criterion.self_feedback }} <p class="feedback__value__raw">{{ criterion.self_feedback }}</p>
</div> </div>
</li> </li>
{% endif %} {% endif %}
...@@ -215,9 +215,7 @@ ...@@ -215,9 +215,7 @@
<div class="answer__value"> <div class="answer__value">
<h6 class="label sr">{% trans "Peer's assessment" %}: </h6> <h6 class="label sr">{% trans "Peer's assessment" %}: </h6>
<div class="value"> <p class="answer__value__raw">{{ assessment.feedback }}</p>
<p>{{ assessment.feedback }}</p>
</div>
</div> </div>
</li> </li>
{% endif %} {% endif %}
...@@ -234,9 +232,7 @@ ...@@ -234,9 +232,7 @@
<div class="answer__value"> <div class="answer__value">
<h6 class="label sr">{% trans "Your assessment" %}: </h6> <h6 class="label sr">{% trans "Your assessment" %}: </h6>
<div class="value"> <p class="answer__value__raw">{{ self_assessment.feedback }}</p>
<p>{{ self_assessment.feedback }}</p>
</div>
</div> </div>
</li> </li>
{% endif %} {% endif %}
......
openassessment/xblock/static/css/openassessment.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/sass/oa/utilities/_extends.scss
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
.question__title__copy { .question__title__copy {
@extend %t-heading; @extend %t-heading;
margin-left: ($baseline-h/4); margin-left: ($baseline-h/4);
white-space: pre-wrap;
color: $heading-color; color: $heading-color;
} }
} }
...@@ -246,6 +247,7 @@ ...@@ -246,6 +247,7 @@
.answer__tip { .answer__tip {
margin-bottom: ($baseline-v/2); margin-bottom: ($baseline-v/2);
white-space: pre-wrap;
@extend %copy-3; @extend %copy-3;
margin-right: $baseline-v; margin-right: $baseline-v;
......
openassessment/xblock/static/sass/oa/views/_oa-base.scss
...@@ -634,6 +634,7 @@ ...@@ -634,6 +634,7 @@
.question__title__copy { .question__title__copy {
margin-left: 0; margin-left: 0;
white-space: pre-wrap;
} }
textarea { textarea {
...@@ -858,6 +859,7 @@ ...@@ -858,6 +859,7 @@
.question__title__copy { .question__title__copy {
@extend %t-heading; @extend %t-heading;
margin-left: ($baseline-h/4); margin-left: ($baseline-h/4);
white-space: pre-wrap;
color: $heading-color; color: $heading-color;
} }
...@@ -942,6 +944,10 @@ ...@@ -942,6 +944,10 @@
display: block; display: block;
margin-bottom: ($baseline-v/2); margin-bottom: ($baseline-v/2);
color: $heading-primary-color; color: $heading-primary-color;
.answer__value__raw {
white-space: pre-wrap;
}
} }
.answer__value__value { .answer__value__value {
...@@ -1015,6 +1021,11 @@ ...@@ -1015,6 +1021,11 @@
.feedback__value { .feedback__value {
@extend %copy-3; @extend %copy-3;
display: block; display: block;
.feedback__value__raw {
white-space: pre-wrap;
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment