From c5b53a6f4bccf7c04ef6c17d248fa3756dc08b8f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 5 Feb 2014 15:32:53 -0800
Subject: [PATCH] Make form element css more consistent

---
 CRM/Core/Form/Renderer.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 0783e4a046..fdfa8758aa 100644
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -160,19 +160,19 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
 
     $class = $element->getAttribute('class');
     $type = $element->getType();
-    if (empty($class)) {
-      $class = 'form-' . $type;
-
+    if (!$class) {
       if ($type == 'text') {
         $size = $element->getAttribute('size');
         if (!empty($size)) {
           if (array_key_exists($size, self::$_sizeMapper)) {
-            $class = $class . ' ' . self::$_sizeMapper[$size];
+            $class .= ' ' . self::$_sizeMapper[$size];
           }
         }
       }
     }
 
+    $class .= ($class ? ' ' : '') . 'crm-form-' . $type;
+
     if ($required) {
       $class .= ' required';
     }
-- 
2.25.1