From ea7df6863674258cbc34e43d4b42951868a20c3a Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 2 Sep 2014 11:35:20 -0400
Subject: [PATCH] Updates for contact form

Bring in some styles changes that need to be in contactform.css
---
 Toolkit/Contacts/ContactUs.php              | 17 +++++++++--------
 Toolkit/Contacts/templates/contactForm.html |  4 ++--
 css/contactform.css                         |  9 ++++++++-
 css/normalize.css                           |  2 +-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Toolkit/Contacts/ContactUs.php b/Toolkit/Contacts/ContactUs.php
index 2dd4536..2701e4b 100755
--- a/Toolkit/Contacts/ContactUs.php
+++ b/Toolkit/Contacts/ContactUs.php
@@ -524,6 +524,13 @@ class Toolkit_Contacts_ContactUs
                 );
             }
         }
+        $e[] = array(
+            'type'    => 'CAPTCHA_Image',
+            'req'     => false,
+            'name'    => 'captcha_question',
+            'display' => 'Verification code',
+            'opts'    => $this->captchaOptions
+        );
         if (is_array($this->interestsGroups)) {
             foreach ($this->interestsGroups as $group => $gData) {
                 $this->myGroups[] = $gData;
@@ -538,13 +545,7 @@ class Toolkit_Contacts_ContactUs
                 );
             }
         }
-        $e[] = array(
-            'type'    => 'CAPTCHA_Image',
-            'req'     => false,
-            'name'    => 'captcha_question',
-            'display' => 'Verification code',
-            'opts'    => $this->captchaOptions
-        );
+
         $e[] = array(
             'type'    => 'text',
             'req'     => true,
@@ -557,7 +558,7 @@ class Toolkit_Contacts_ContactUs
             'name'    => 'submit_rmv',
             'display' => 'Submit Form',
             'opts'    => array('class' => 'button')
-            
+
         );
 
         $this->setupElements($e);
diff --git a/Toolkit/Contacts/templates/contactForm.html b/Toolkit/Contacts/templates/contactForm.html
index 34f1676..ab0193c 100644
--- a/Toolkit/Contacts/templates/contactForm.html
+++ b/Toolkit/Contacts/templates/contactForm.html
@@ -17,7 +17,7 @@
                 {if:elem.isButton()}
                     {if:elem.notFrozen()}
                         <div class="medium-6 small-12 columns">{elem.html:h}</div>
-                    
+
                     {end:}
                 {else:}
                     {if:elem.error}
@@ -32,7 +32,7 @@
                             {elem.label:h}
                     {else:}
                         {if:elem.isType(#CAPTCHA_Image#)}
-                                {if:elem.required}<label>{else:}<label class="req">{end:}
+                                {if:elem.required}<label>{else:}<label class="req glmCaptchaImg">{end:}
                                 {if:elem.required}<span class="req">*</span>{end:}
                             {elem.label:h}
 
diff --git a/css/contactform.css b/css/contactform.css
index 9dedb38..793f6b3 100644
--- a/css/contactform.css
+++ b/css/contactform.css
@@ -99,10 +99,17 @@ table tr.req td.instructioncell {
 	color: #000;
 	}
 .glmCheckBox {
-	width: 200px;
 	float: left;
+    width: auto;
+    margin-bottom: 1rem;
 }
 .single-checkbox label.glmCheckBox {
     width: auto;
     float: none;
 }
+#QF_CAPTCHA_captcha_question {
+    margin-bottom: 15px;
+}
+label.glmCaptchaImg * {
+    vertical-align: middle !important;
+}
\ No newline at end of file
diff --git a/css/normalize.css b/css/normalize.css
index 08f8950..83d8f11 100644
--- a/css/normalize.css
+++ b/css/normalize.css
@@ -254,7 +254,7 @@ select,
 textarea {
   color: inherit; /* 1 */
   font: inherit; /* 2 */
-  margin: 0; /* 3 */
+/*  margin: 0;  3 */
 }
 
 /**
-- 
2.17.1