Fix the staff area styling

openassessment/templates/openassessmentblock/staff_area/oa_student_info.html

@@ -239,11 +239,11 @@
         </div>
     </div>
 
-    <div class="staff-info__staff-override ui-staff__action__section wrapper--ui--collapse">
+    <div class="staff-info__staff-override ui-staff__content__section wrapper--ui--collapse">
         <div class="ui-staff ui-toggle-visibility is--collapsed">
-            <h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
+            <h2 class="staff-info__title ui-staff__subtitle ui-toggle-visibility__control">
                 <i class="icon fa fa-caret-right"></i>
-                <span>{% trans "Assessment Override" %}</span>
+                <span>{% trans "Submit Assessment Grade Override" %}</span>
             </h2>
 
             <div class="staff-info__staff-override__content ui-toggle-visibility__content">
@@ -255,9 +255,9 @@
     </div>
 
     {% if not workflow_cancellation %}
-        <div class="staff-info__workflow-cancellation ui-staff__action__section wrapper--ui--collapse">
+        <div class="staff-info__workflow-cancellation ui-staff__content__section wrapper--ui--collapse">
             <div class="ui-staff ui-toggle-visibility is--collapsed">
-                <h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
+                <h2 class="staff-info__title ui-staff__subtitle ui-toggle-visibility__control">
                     <i class="icon fa fa-caret-right"></i>
                     <span>{% trans "Remove submission from peer grading" %}</span>
                 </h2>

openassessment/xblock/static/sass/oa/elements/_staff.scss

@@ -35,6 +35,11 @@
         .ui-staff__content {
           margin-top: 0;
         }
+
+        .staff-info__cancel-submission__content,
+        .staff-info__staff-override__content {
+          padding: 0;
+        }
       }
 
       .ui-toggle-visibility__content {

openassessment/xblock/static/sass/oa/utilities/_developer.scss

@@ -157,34 +157,14 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
     }
   }
 
-  .value {
-    width: $max-width/2;
-  }
-
-  .ui-staff__action__section {
+  .staff-info__cancel-submission__content,
+  .staff-info__staff-override__content {
     padding: $baseline-v ($baseline-h/2);
     background-color: white;
-    margin-bottom: ($baseline-v/2);
-
-    .ui-staff__title {
-      text-transform: none;
-      font-size: 18px;
-      font-weight: 600;
-      line-height: 27px;
-    }
-
-    .label {
-      color: $edx-gray-d4;
-    }
-
-    .title {
-      color: $edx-gray-d4;
-    }
+  }
 
-    .title--sub {
-      font-size: 18px;
-      color: $edx-gray-d4;
-    }
+  .value {
+    width: $max-width/2;
   }
 
   // staff assessments
@@ -242,7 +222,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
       @extend %ui-rubric-answers;
     }
 
-    // genereal feedback question
+    // general feedback question
     .assessment__rubric__question--feedback {
 
       .wrapper--input {

openassessment/xblock/static/sass/oa/utilities/_shame.scss

@@ -199,17 +199,6 @@
 }
 
 .staff-info__student {
-  .ui-staff__action__section {
-    .ui-staff__title span {
-      color: $edx-blue !important;
-      font-weight: 600 !important;
-    }
-
-    .ui-staff__title i {
-      color: $edx-blue !important;
-    }
-  }
-
   // 'p' elements in LMS have a color set on them.
   .student__answer__display__content p {
     color: inherit;