Commit 2f21844d by Eric Fischer

Merge pull request #890 from edx/efischer/css_fixes

Updates to account for a11y CSS changes
parents f58c73d3 05e04b39
...@@ -99,22 +99,22 @@ ...@@ -99,22 +99,22 @@
<ul class="list list--actions"> <ul class="list list--actions">
<li class="list--actions__item"> <li class="list--actions__item">
<button type="submit" id="submission__save" class="action action--save submission__save is--disabled">{% trans "Save your progress" %}</button> <button type="submit" id="submission__save" class="action action--save submission__save is--disabled" aria-describedby="response__save_status">
{% trans "Save your progress" %}
</button>
<div id="response__save_status" class="response__submission__status"> <div id="response__save_status" class="response__submission__label">
<h3 class="response__submission__status__title"> <span class="sr">{% trans "Your Submission Status" %}:</span>
<span class="sr">{% trans "Your Submission Status" %}:</span> {{ save_status }}
{{ save_status }}
</h3>
</div> </div>
</li> </li>
{% if allow_latex %} {% if allow_latex %}
<li class="list--actions__item"> <li class="list--actions__item">
<button type="submit" id="submission__preview" class="action action--save submission__save is--disabled">{% trans "Preview in LaTeX"%}</button> <button type="submit" id="submission__preview" class="action action--save submission__save is--disabled" aria-describedby="response__preview_explanation">
<div id="response__preview_explanation" class="response__submission__status"> {% trans "Preview in LaTeX"%}
<h3 class="response__submission__status__title"> </button>
{% trans "Click to preview your submission in LaTeX"%} <div id="response__preview_explanation" class="response__submission__label">
</h3> {% trans "Click to preview your submission in LaTeX"%}
</div> </div>
</li> </li>
<li id = "submission__preview__item" class="list--actions__item"> <li id = "submission__preview__item" class="list--actions__item">
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -225,7 +225,7 @@ OpenAssessment.ResponseView.prototype = { ...@@ -225,7 +225,7 @@ OpenAssessment.ResponseView.prototype = {
string: The current status message. string: The current status message.
**/ **/
saveStatus: function(msg) { saveStatus: function(msg) {
var sel = $('#response__save_status h3', this.element); var sel = $('#response__save_status', this.element);
if (typeof msg === 'undefined') { if (typeof msg === 'undefined') {
return sel.text(); return sel.text();
} else { } else {
......
...@@ -51,8 +51,7 @@ ...@@ -51,8 +51,7 @@
} }
.ui-staff__subtitle { .ui-staff__subtitle {
@extend %t-subheading; @extend %t-heading;
@extend %t-strong;
@include fontSize($f-size-medium); @include fontSize($f-size-medium);
// We want to keep the collapsible headers within the staff assessment block blue // We want to keep the collapsible headers within the staff assessment block blue
// (because they are being displayed in the LMS color scheme). Unfortunately because of // (because they are being displayed in the LMS color scheme). Unfortunately because of
......
...@@ -16,12 +16,6 @@ ...@@ -16,12 +16,6 @@
%t-heading { %t-heading {
@extend %hd-4; @extend %hd-4;
@extend %t-strong; @extend %t-strong;
@extend %t-titlecase;
}
%t-subheading {
@extend %hd-4;
@extend %t-strong;
} }
%t-score { %t-score {
......
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
// NOTES: use for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css) // NOTES: use for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css)
.wrapper--xblock .openassessment h3.staff__grade__title {
font-size: inherit;
margin-bottom: 5px;
}
.openassessment { .openassessment {
// -------------------- // --------------------
...@@ -11,11 +16,12 @@ ...@@ -11,11 +16,12 @@
// rules to overcome any poorly defined, scoped, or architected edX LMS-based CSS. Ideally this file will be removed when the LMS Front End is re-visited. // rules to overcome any poorly defined, scoped, or architected edX LMS-based CSS. Ideally this file will be removed when the LMS Front End is re-visited.
// headers // headers
.self-assessment__display__header, .peer-assessment__display__header, .step__header { .self-assessment__display__header, .peer-assessment__display__header, .step__header,
.staff-assessment__display__header, .submission__answer__display__header, .student-training__display__header {
margin-bottom: 0 !important; margin-bottom: 0 !important;
border-radius: 0 !important; border-radius: 0 !important;
padding-bottom: 0 !important; padding-bottom: 0 !important;
font-size: inherit !important; font-size: initial !important;
border-bottom: none !important; border-bottom: none !important;
} }
......
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
} }
.submission__answer__part__text__title { .submission__answer__part__text__title {
@extend %t-subheading; @extend %t-heading;
} }
div.submission__answer__part__text__value { div.submission__answer__part__text__value {
...@@ -542,7 +542,9 @@ ...@@ -542,7 +542,9 @@
} }
} }
.response__submission__status { .response__submission__label {
@extend %t-score;
color: $action-secondary-color;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@include margin-left(($baseline-h/4)); @include margin-left(($baseline-h/4));
...@@ -552,11 +554,6 @@ ...@@ -552,11 +554,6 @@
} }
} }
.response__submission__status__title {
@extend %t-score;
color: $action-secondary-color;
}
.response__submission__actions { .response__submission__actions {
.list--actions__item { .list--actions__item {
......
...@@ -82,8 +82,8 @@ class OpenAssessmentTest(WebAppTest): ...@@ -82,8 +82,8 @@ class OpenAssessmentTest(WebAppTest):
OPTIONS_SELECTED = [1, 2] OPTIONS_SELECTED = [1, 2]
STAFF_OVERRIDE_OPTIONS_SELECTED = [0, 1] STAFF_OVERRIDE_OPTIONS_SELECTED = [0, 1]
STAFF_OVERRIDE_SCORE = 1 STAFF_OVERRIDE_SCORE = 1
STAFF_GRADE_EXISTS = "COMPLETE" STAFF_GRADE_EXISTS = "Complete"
STAFF_OVERRIDE_LEARNER_STEPS_NOT_COMPLETE = "YOU MUST COMPLETE THE STEPS ABOVE TO VIEW YOUR GRADE" STAFF_OVERRIDE_LEARNER_STEPS_NOT_COMPLETE = "You Must Complete the Steps Above to View Your Grade"
STAFF_AREA_SCORE = "Final grade: {} out of 8" STAFF_AREA_SCORE = "Final grade: {} out of 8"
STAFF_OVERRIDE_STAFF_AREA_NOT_COMPLETE = "The problem has not been completed." STAFF_OVERRIDE_STAFF_AREA_NOT_COMPLETE = "The problem has not been completed."
EXPECTED_SCORE = 6 EXPECTED_SCORE = 6
...@@ -323,14 +323,14 @@ class StaffAssessmentTest(OpenAssessmentTest): ...@@ -323,14 +323,14 @@ class StaffAssessmentTest(OpenAssessmentTest):
self.submission_page.visit() self.submission_page.visit()
# Verify that staff grade step is shown initially # Verify that staff grade step is shown initially
self._verify_staff_grade_section("NOT AVAILABLE", None) self._verify_staff_grade_section("Not Available", None)
# User submits a response # User submits a response
self.submission_page.submit_response(self.SUBMISSION) self.submission_page.submit_response(self.SUBMISSION)
self.assertTrue(self.submission_page.has_submitted) self.assertTrue(self.submission_page.has_submitted)
# Verify staff grade section appears as expected # Verify staff grade section appears as expected
self._verify_staff_grade_section("NOT AVAILABLE", "WAITING FOR A STAFF GRADE") self._verify_staff_grade_section("Not Available", "Waiting for a Staff Grade")
# Perform staff assessment # Perform staff assessment
self.staff_area_page = StaffAreaPage(self.browser, self.problem_loc) self.staff_area_page = StaffAreaPage(self.browser, self.problem_loc)
......
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