Merge remote-tracking branch 'refs/remotes/origin/master' into QRdetailsToggleOnPayment

Author: jjeffryes

css/obBase.css

@@ -1216,6 +1216,14 @@ h5 {
   font-size: 15px;
 }
 
+.fieldItem-textarea h2, .fieldItem-textarea h3, .editableContent h2, .editableContent h3 {
+  margin-top: 30px;
+}
+
+.fieldItem-textarea h2:first-child, .fieldItem-textarea h3:first-child, .editableContent h2:first-child, .editableContent h3:first-child {
+  margin-top: 0px;
+}
+
 .note {
   /* use for instructions and incidental text */
   /*font-style: italic;*/

js/templates/userPage.html

@@ -257,7 +257,7 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
               </a>
             <%}%>
             <% if(ob.page.profile.about) { %>
-             <p class="js-userAbout margin0 flexContainer editableContent"><%= ob.page.profile.displayAbout %></p>
+             <div class="js-userAbout margin0 flexContainer editableContent"><%= ob.page.profile.displayAbout %></div>
             <%}else{%>
               <span class="textOpacity75"><%= polyglot.t('AboutEmpty') %></span>
             <%}%>