address cale's feedback

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

@@ -129,6 +129,10 @@ div.problem-progress {
   font-size: em(16);
 }
 
+h3.problem-header {
+  margin-bottom: 0 !important; // needed to overrided the %hd-2 margin-bottom
+}
+
 // +Problem - Base
 // ====================
 div.problem {
@@ -153,10 +157,6 @@ div.problem {
   div.question:not(:last-child) {
     margin-bottom: $baseline;
   }
-  
-  h3.problem-header {
-    margin-bottom: 0 !important; // needed to overrided the %hd-2 margin-bottom
-  }
 }
 
 // +Problem - Choice Group

common/lib/xmodule/xmodule/templates/problem/customgrader.yaml

@@ -23,11 +23,13 @@ data: |
             "solution" tags, and that learners do not see these images until they
             click the "Show Answer" button.
           </p>
-      <p> For more information, see <a
+          <p>
+            For more information, see <a
             href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_python.html" target="_blank">
             Write-Your-Own-Grader Problem</a> in <i>Building and Running an edX Course</i>.
           </p>
-      <p>When you add the problem, be sure to select <strong>Settings</strong>
+          <p>
+            When you add the problem, be sure to select <strong>Settings</strong>
             to specify a <strong>Display Name</strong> and other values that apply.</p>
           <p>You can use the following example problem as a model.</p>
           <hr />
@@ -77,5 +79,4 @@ data: |
               </div>
             </solution>
         </question>
-
       </problem>
\ No newline at end of file

common/lib/xmodule/xmodule/templates/problem/formularesponse.yaml

@@ -27,12 +27,16 @@ data: |
             A Brief Introduction to MathJax in Studio</a> in <i>Building and Running an edx
             Course</i>.
           </p>
-  <p>When you add the problem, be sure to select <strong>Settings</strong>
-  to specify a <strong>Display Name</strong> and other values that apply.</p>
+          <p>
+            When you add the problem, be sure to select <strong>Settings</strong>
+            to specify a <strong>Display Name</strong> and other values that apply.
+          </p>
           <p>You can use the following example problems as models.</p>
         
-  <p>Write an expression for the product of \( R_1\), \( R_2\), and
-  the inverse of \( R_3\) .</p>
+          <p>
+            Write an expression for the product of \( R_1\), \( R_2\), and
+            the inverse of \( R_3\) .
+          </p>
           <formularesponse type="ci" samples="R_1,R_2,R_3@1,2,3:3,4,5#10" answer="$VoVi">
             <responseparam type="tolerance" default="0.00001"/>
             <formulaequationinput size="40" label="Enter the equation"/>
@@ -44,8 +48,10 @@ data: |
         </question>
     
         <question>
-  <p>Let \( x\) be a variable, and let \( n\) be an arbitrary constant.
-  What is the derivative of \( x^n\)?</p>
+          <p>
+            Let \( x\) be a variable, and let \( n\) be an arbitrary constant.
+            What is the derivative of \( x^n\)?
+          </p>
         
           <script type="loncapa/python">
       derivative = "n*x^(n-1)"
@@ -56,5 +62,4 @@ data: |
             <formulaequationinput size="40"  label="Enter the equation"/>
           </formularesponse>
         </question>
-
       </problem>
\ No newline at end of file

common/lib/xmodule/xmodule/templates/problem/jsinput_response.yaml

@@ -24,11 +24,15 @@ data: |
             <a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_javascript.html" target="_blank">
             Custom JavaScript Problem</a> in <i>Building and Running an edX Course</i>.
           </p>
-      <p>JavaScript developers can also see
+          <p>
+            JavaScript developers can also see
             <a href="http://edx.readthedocs.io/projects/edx-developer-guide/en/latest/extending_platform/javascript.html" target="_blank">
-      Custom JavaScript Applications</a> in the <i>EdX Developer's Guide</i>.</p>
-      <p>When you add the problem, be sure to select <strong>Settings</strong>
-      to specify a <strong>Display Name</strong> and other values that apply.</p>
+            Custom JavaScript Applications</a> in the <i>EdX Developer's Guide</i>.
+          </p>
+          <p>
+            When you add the problem, be sure to select <strong>Settings</strong>
+            to specify a <strong>Display Name</strong> and other values that apply.
+          </p>
           <p>You can use the following example problem as a model.</p>
     
           <script type="loncapa/python">
@@ -54,8 +58,10 @@ data: |
         '''
       ]]>
           </script>
-      <p>In the following image, click the objects until the cone is yellow
-      and the cube is blue.</p>
+          <p>
+            In the following image, click the objects until the cone is yellow
+            and the cube is blue.
+          </p>
           <customresponse cfn="vglcfn">
             <jsinput gradefn="WebGLDemo.getGrade"
               get_statefn="WebGLDemo.getState"

common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml

@@ -88,7 +88,7 @@ metadata:
 
 data: |
       <?xml version="1.0"?>
-    <problem showanswer="closed" rerandomize="never" weight="10" display_name="lec1_Q2">
+      <problem>
         <question>
           <p>
             If you have a problem that is already written in LaTeX, you can use this problem type to
@@ -115,8 +115,6 @@ data: |
           </solution>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Multiple Choice Problem</strong></p>
           <p>Which of the following countries has the largest population?</p>
@@ -140,8 +138,6 @@ data: |
           </solution>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Math Expression Problem</strong></p>
           <p>What is Einstein's equation for the energy equivalent of a mass [mathjaxinline]m[/mathjaxinline]?</p>
@@ -150,8 +146,6 @@ data: |
           </symbolicresponse>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Numerical Problem</strong></p>
           <p>Estimate the energy savings (in J/y) if all the people ([mathjaxinline]3\times 10^8[/mathjaxinline]) in the U.&#xA0;S. switched from U.&#xA0;S. code to low-flow shower heads.</p>
@@ -164,8 +158,6 @@ data: |
           </numericalresponse>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Fill-in-the-Blank Problem</strong></p>
           <p>What was the first post-secondary school in China to allow both male and female students?</p>
@@ -182,8 +174,6 @@ data: |
           </solution>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Custom Python-Evaluated Input Problem</strong></p>
           <script type="loncapa/python">
@@ -211,8 +201,6 @@ data: |
           </solution>
         </question>
   
-      <br/>
-
         <question>
           <p>Enter two integers that sum to 20.</p>
           <customresponse cfn="test_add" expect="20">
@@ -229,8 +217,6 @@ data: |
           </solution>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Image Mapped Input Problem</strong></p>
           <p>
@@ -251,8 +237,6 @@ data: |
           </solution>
         </question>
   
-      <br/>
-
         <question>
           <p><strong>Example Hidden Explanation</strong></p>
           <p>You can provide additional information that only appears at certain times by including a "showhide" flag. </p>

common/lib/xmodule/xmodule/tests/test_capa_module.py

@@ -1344,7 +1344,7 @@ class CapaModuleTest(unittest.TestCase):
 
         # Check the AJAX call that gets the hint by question     id and hint index
         for question_id in range(num_questions):
-            for hint_index in (0, 1, 2):
+            for hint_index in range(3):
                 result = module.get_demand_hint(question_id, hint_index)
                 hint_num = hint_index % 2
                 self.assertEqual(