Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/styles

Conflicts:
	openassessment/xblock/static/js/openassessment-studio.min.js

openassessment/xblock/static/js/spec/studio/oa_edit.js

@@ -83,4 +83,14 @@ describe("OpenAssessment.StudioView", function() {
         view.save();
         expect(runtime.notify).toHaveBeenCalledWith('error', {msg: 'Test error'});
     });
+
+    it("displays the correct tab on initialization", function() {
+        $(".oa_editor_tab", view.element).each(function(){
+            if ($(this).attr('aria-controls') == "oa_prompt_editor_wrapper"){
+                expect($(this).hasClass('ui-state-active')).toBe(true);
+            } else {
+                expect($(this).hasClass('ui-state-active')).toBe(false);
+            }
+        });
+    });
 });

openassessment/xblock/static/js/src/studio/oa_edit.js

@@ -93,7 +93,7 @@ OpenAssessment.StudioView.prototype = {
     initializeTabs: function() {
         // If this is the first editor that the user has opened, default to the prompt view.
         if (typeof(OpenAssessment.lastOpenEditingTab) === "undefined") {
-            OpenAssessment.lastOpenEditingTab = 0;
+            OpenAssessment.lastOpenEditingTab = 2;
         }
         // Initialize JQuery UI Tabs, and activates the appropriate tab.
         $(".openassessment_editor_content_and_tabs", this.element)

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

@@ -197,6 +197,12 @@
     float: left;
   }
 
+  input[type="number"]{
+    background-image: -moz-linear-gradient(#F2F2F2,#FFF);
+    background-image: -webkit-linear-gradient(#F2F2F2,#FFF);
+    background-image: linear-gradient(#F2F2F2,#FFF);
+  }
+
   .oa_editor_tab{
     float: right;
     padding: ($baseline-v/8) ($baseline-h/8);
@@ -211,7 +217,7 @@
     width: 100%;
     border-radius: 3px;
     border: 1px solid $edx-gray-d1;
-    background-color: #f5f5f5;
+    background-color: white;
     overflow-y: scroll;
   }
 
@@ -642,7 +648,9 @@
       border: 1px solid #b2b2b2;
       border-radius: 2px;
       padding: 6px 8px 8px;
-      background-color: #f2f2f2;
+      background-image: -webkit-linear-gradient(#F2F2F2,#FFF);
+      background-image: -moz-linear-gradient(#F2F2F2,#FFF);
+      background-image: linear-gradient(#F2F2F2,#FFF);
       box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
       font-family: 'Open Sans', sans-serif;
       font-size: 11px;
@@ -824,7 +832,7 @@
           border: 1px solid #b2b2b2;
           border-radius: 2px;
           padding: 6px 8px 8px;
-          background-color: #f2f2f2;
+          background-color: white;
           box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
           font-family: 'Open Sans', sans-serif;
           font-size: 11px;