CSS cleanup related to font awesome upgrade.

Addressing step-based layout issues
Make collapse/expand toggles always
Correcting border color on feedback section heading

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

@@ -37,28 +37,10 @@
 
     // step title/name
     h2.step__title {
-      margin-top: 0 !important;
       @include text-align(left);
+      @include float(none);
+      margin-top: 0 !important;
 
-      @include media($bp-m) {
-        margin-bottom: ($baseline-v/2);
-      }
-
-      @include media($bp-ds) {
-        @include bidi-span-columns(4 of 6);
-      }
-
-      @include media($bp-dm) {
-        @include bidi-span-columns(8 of 12);
-      }
-
-      @include media($bp-dl) {
-        @include bidi-span-columns(8 of 12);
-      }
-
-      @include media($bp-dx) {
-        @include bidi-span-columns(9 of 12);
-      }
 
       .step__label {
         text-transform: none;
@@ -85,10 +67,6 @@
     }
   }
 
-  .step__status {
-
-  }
-
   .step__status__value {
     line-height: 0;
   }
@@ -147,6 +125,14 @@
     @include padding-left(0);
   }
 
+  // submission/results collapse and expand targets
+  .question__title.ui-toggle-visibility__control {
+
+    .question__title__copy  {
+      color: inherit !important;
+    }
+  }
+
 
   .step--grade .step__title {
     width: 100% !important;
@@ -185,6 +171,8 @@
     margin-bottom: 0;
   }
 
+  //
+
 
   // --------------------
   // needed overrides

openassessment/xblock/static/sass/oa/views/_oa-base.scss

@@ -41,24 +41,11 @@
   .openassessment__steps__step {
     @extend %ui-section;
 
-    // step header
-    .step__header {
-      @include row();
-    }
-
     // step title
     .step__title {
+      display: block;
       margin-bottom: ($baseline-v/2);
-
-      @include media($bp-ds) {
-        @include bidi-span-columns(4 of 6);
-        margin-bottom: 0;
-      }
-
-      @include media($bp-dm) {
-        @include bidi-span-columns(8 of 12);
-        margin-bottom: 0;
-      }
+      width: 100%;
 
       @include media($bp-dl) {
         @include bidi-span-columns(8 of 12);
@@ -85,25 +72,51 @@
           @include border-left(none);
           @include padding-left(0);
         }
+
+        @include media($bp-ds) {
+          @include margin-left(0);
+          @include border-left(none);
+          @include padding-left(0);
+        }
       }
 
       .step__counter {
+        display: none;
 
         // increment: show numbers using parent list counter
         &:before {
           @extend %hd-2;
           @extend %t-strong;
+          display: none;
           content: counter(item, decimal);
           counter-increment: item;
           color: $color-decorative-tertiary;
         }
 
-        @include media($bp-m) {
-          display: none;
+        @include media($bp-dm) {
+          display: inline-block;
+
+
+          &:before {
+            display: inline;
+          }
+        }
+
+        @include media($bp-dl) {
+          display: inline-block;
+
+
+          &:before {
+            display: inline;
+          }
+        }
+
+        @include media($bp-dx) {
+          display: inline-block;
 
 
           &:before {
-            display: none;
+            display: inline;
           }
         }
       }
@@ -126,6 +139,28 @@
     // step status
     .step__status {
       display: inline-block;
+      margin-top: ($baseline-v/4);
+
+      @include media($bp-dm) {
+        margin-top: 0;
+        @include float(right);
+        position: relative;
+        top: -($baseline-v*2);
+      }
+
+      @include media($bp-dl) {
+        margin-top: 0;
+        @include float(right);
+        position: relative;
+        top: -($baseline-v*2);
+      }
+
+      @include media($bp-dx) {
+        margin-top: 0;
+        @include float(right);
+        position: relative;
+        top: -($baseline-v*2);
+      }
 
       .step__status__value {
         border-radius: ($baseline-v/10);
@@ -161,38 +196,6 @@
         @extend %t-score;
         color: $heading-color;
       }
-
-      @include media($bp-m) {
-        position: relative;
-      }
-
-      @include media($bp-ds) {
-        @include bidi-span-columns(2 of 6);
-        @include bidi-omega();
-        position: relative;
-        top: -12px;
-      }
-
-      @include media($bp-dm) {
-        @include bidi-span-columns(4 of 12);
-        @include bidi-omega();
-        position: relative;
-        top:-12px;
-      }
-
-      @include media($bp-dl) {
-        @include bidi-span-columns(4 of 12);
-        @include bidi-omega();
-        position: relative;
-        top: -12px;
-      }
-
-      @include media($bp-dx) {
-        @include bidi-span-columns(3 of 12);
-        @include bidi-omega();
-        position: relative;
-        top: -12px;
-      }
     }
 
     .step__status__label {
@@ -1060,7 +1063,7 @@
   .submission__feedback__title {
     @extend %ui-subsection-title;
     @extend %t-heading;
-    margin-bottom: ($baseline-v/2);
+    border-bottom-color: solid $heading-color;
     color: $heading-color;
 
     .icon {