cleaned up padding for peer review training and grading states, removed…

cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style

common/lib/xmodule/xmodule/css/combinedopenended/display.scss

@@ -266,8 +266,6 @@ div.combined-rubric-container {
 
   h4 {
     padding-top: $baseline/2;
-    border-color: lightgray;
-    border-top: 1px solid;
   }
 
   span.rubric-category {
@@ -892,7 +890,6 @@ section.open-ended-child {
 
 .oe-tools {
   display: inline-block;
-  padding-left: $baseline;
   width: 100%;
   border-radius: 5px;
 

common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html

@@ -42,7 +42,7 @@
         </div>
       </div>
       <div class="oe-tools response-tools">
-        <span class="oe-tools-label">Response: </span>
+        <span class="oe-tools-label"></span>
         <input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
       </div>
       <input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">

common/lib/xmodule/xmodule/js/fixtures/rubric.html

@@ -78,7 +78,7 @@
         </div>
     </div>
     <div class="oe-tools response-tools">
-        <span class="oe-tools-label">Response: </span>
+        <span class="oe-tools-label"></span>
         <input type="button" value="Reset" class="reset-button" name="reset" style="display: inline-block;">
     </div>
 </div>

lms/static/sass/course/_staff_grading.scss

@@ -36,10 +36,10 @@ div.peer-grading{
         &.submission-container{
             @include clearfix;
             overflow-y: auto;
-            height: auto;
             max-height: 300px;
+            height: auto;
             border: 1px solid #ddd;
-            background: #F6F6F6;
+            background: #f6f6f6;
         }
     }
 
@@ -47,7 +47,6 @@ div.peer-grading{
         margin: 0;
         padding: 2px;
         min-width: 50px;
-        background-color: white;
         text-size: 1.5em;
     }
     
@@ -63,7 +62,7 @@ div.peer-grading{
     }
 
     .problem-list {
-        width:100%;
+        width: 100%;
         table-layout: auto;
         text-align: center;
         
@@ -193,6 +192,20 @@ div.peer-grading {
     border-radius: $baseline/2;
     padding: 0;
 
+    .peer-grading-tools {
+        padding: $baseline;
+    }
+
+    .error-container {
+        margin: $baseline;
+        border-radius: $baseline/4;
+        padding: $baseline/2;
+    }
+
+    .interstitial-page, .calibration -feedback, .calibration-interstitial-page {
+        padding: $baseline;
+    }
+
     .prompt-wrapper {
         padding: $baseline;
     }

lms/templates/combinedopenended/combined_open_ended.html

@@ -38,7 +38,7 @@
             % endfor
             </div>
             <div class="oe-tools response-tools">
-                <span class="oe-tools-label">${_("Response: ")}</span>
+                <span class="oe-tools-label"></span>
                 <input type="button" value="${_('Reset')}" class="reset-button" name="reset"/>
             </div>
         </div>

lms/templates/peer_grading/peer_grading.html

@@ -2,8 +2,9 @@
 <section class="container peer-grading-container">
     <div class="peer-grading" data-ajax-url="${ajax_url}" data-use-single-location="${use_single_location}">
         <div class="error-container">${error_text}</div>
-        <h1>${_("Peer Grading")}</h1>
-        <h2>${_("Instructions")}</h2>
+        <div class="peer-grading-tools">
+            <h1 class="peer-grading-title">${_("Peer Grading")}</h1>
+            <h2 class="peer-grading-instructions">${_("Instructions")}</h2>
             <p>${_("Here are a list of problems that need to be peer graded for this course.")}</p>
             % if success:
                 % if len(problem_list) == 0:
@@ -57,4 +58,5 @@
                 %endif
             %endif
         </div>
+    </div>
 </section>