Merge branch 'diana/peer-grading-improvements' into diana/peer-grading-views

lms/static/coffee/src/peer_grading/peer_grading_problem.coffee

@@ -146,6 +146,8 @@ class PeerGradingProblem
     @interstitial_page_button = $('.interstitial-page-button')
 
     Collapsible.setCollapsibles(@content_panel)
+
+    # Set up the click event handlers
     @action_button.click -> history.back()
     @calibration_feedback_button.click => 
       @calibration_feedback_panel.hide()
@@ -358,6 +360,7 @@ class PeerGradingProblem
       @calibration_feedback_panel.hide()
       @error_container.html(error_message)
       @content_panel.hide()
+      @action_button.show()
 
   show_submit_button: () =>
     @submit_button.show()

lms/static/sass/course/_staff_grading.scss

@@ -120,29 +120,22 @@ div.peer-grading{
         .calibration-panel
         {
             float:left;
-            width:47%;
+            width:48%;
         }
         .grading-panel
         {
             float:right;
-            width: 47%;
+            width: 48%;
         }
         .current-state
         {
-            background: #0F6B8A;
+            background: #1D9DD9;
             h3, p
             {
                 color: white;
             }
         }
-        &:after
-        {
-            content:".";
-            display:block;
-            height:0;
-            visibility: hidden;
-            clear:both;
-        }
+        @include clearfix;
     }