From 72027870920f53c1616177b602cacbad790532eb 2017-01-09 21:56:42
From: Brett Smith <brett@sfconservancy.org>
Date: 2017-01-09 21:56:42
Subject: [PATCH] supporter: Reorganize form post-input notes.

This makes it easier to keep baseline alignment between labels and their
respective inputs.  Declaring `margin-left: 51%;` for the post-input notes
is not exactly what we want, but it's much closer and less troublesome than
dealing with the vertical alignment of labels otherwise.

---

diff --git a/www/conservancy/static/css/conservancy-bigscreen.css b/www/conservancy/static/css/conservancy-bigscreen.css
index 95150260d2c89e6ebf3d8282b097c2a11cc2bd76..a5c14dff00da30358df4d1c68df9872ae1544a20 100644
--- a/www/conservancy/static/css/conservancy-bigscreen.css
+++ b/www/conservancy/static/css/conservancy-bigscreen.css
@@ -108,6 +108,6 @@ img.blog-right {
     padding-right: .3em;
 }
 
-.supporter-form-input .inline {
-    display: inline-block;
+.form-error, .supporter-form-input p {
+    margin-left: 51%;
 }
diff --git a/www/conservancy/static/css/forms.css b/www/conservancy/static/css/forms.css
index 3c6c179f7357cfe5b7da62c0c96f00eb1299eddf..f4c89bba4f98bbb40c1d67d48488c2f0916bf253 100644
--- a/www/conservancy/static/css/forms.css
+++ b/www/conservancy/static/css/forms.css
@@ -31,8 +31,7 @@
     text-align: center;
 }
 
-.form-error, .supporter-form-input .input-group p {
-    margin-left: 1em;
+.form-error, .supporter-form-input p {
     font-size: 80%;
     white-space: normal;
 }
diff --git a/www/conservancy/static/js/supporter-page.js b/www/conservancy/static/js/supporter-page.js
index 89ec9301d66c4d8262a59132cb76eda8beb78e55..2f888ba3c82d93ec637636882852096f756ec171 100644
--- a/www/conservancy/static/js/supporter-page.js
+++ b/www/conservancy/static/js/supporter-page.js
@@ -51,7 +51,7 @@ $(document).ready(function() {
 
     $('form.supporter-form').each(function(index, form) {
         var $amountInput = $('input[type=number]', form).first();
-        var $amountError = $('.form-error', $amountInput[0].parentNode);
+        var $amountError = $('.form-error', $amountInput.parents('.supporter-form-input'));
 
         $amountError.on(NEW_AMOUNT_EVENT, function(event, amountData) {
             var isValid = amountData.newAmount >= amountData.minAmount;
diff --git a/www/conservancy/templates/supporter/form_partial.html b/www/conservancy/templates/supporter/form_partial.html
index 4e0cba7d7f3dd2952a645c4b77afa1a1b58cf911..6885a9a02d3eefed4cd866af5ab2d4c0d423988f 100644
--- a/www/conservancy/templates/supporter/form_partial.html
+++ b/www/conservancy/templates/supporter/form_partial.html
@@ -80,10 +80,10 @@ This partial accepts these optional parameters:
         $ <input type="number" name="amount" size="5" tabindex="10"
                min="{{ min_amt }}" value="{{ default_amt }}">
         {% endif %}
-        <p class="form-error">${{ min_amt|add:partial_amt }} is a minimum for
-          Conservancy Supporters.
-          <a href="/donate">Donate smaller amounts here</a>.</p>
         </div>
+      <p class="form-error">${{ min_amt|add:partial_amt }} is a minimum for
+        Conservancy Supporters.
+        <a href="/donate">Donate smaller amounts here</a>.</p>
       </div>
 
       <div class="supporter-form-input">
@@ -124,8 +124,8 @@ This partial accepts these optional parameters:
               <option value="FittedLadiesXL">Fitted Women's XL</option>
             </optgroup>
           </select>
-          <p class="inline"><a href="https://gildanonline.com/sizechart" target="_blank" title="T-shirt size chart">Size information</a></p>
         </div>
+        <p><a href="https://gildanonline.com/sizechart" target="_blank" title="T-shirt size chart">Size information</a></p>
       </div>
 
       <div class="supporter-form-input">