From 839d2a3e2845b1b3b14f2da4493406fffdb3a412 Mon Sep 17 00:00:00 2001
From: git <git@1831444.no-reply.drupal.org>
Date: Tue, 2 May 2017 10:36:48 -0400
Subject: [PATCH] Issue #2874908 by jcandan: Move input-group class.

Move the .input-group from the .form-group div, make .input-group a separate div, and move the label above that .input-group div.
---
 includes/form.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/form.inc b/includes/form.inc
index 1bf8aad..0623e1f 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -199,7 +199,6 @@ function radix_form_element($variables) {
 
   // Recognize non-standard #input_group key to use a Bootstrap input group.
   if (!empty($element['#input_group'])) {
-    $attributes['class'][] = 'input-group';
     $is_input_group = TRUE;
   }
 
@@ -232,8 +231,10 @@ function radix_form_element($variables) {
 
   // Generate the prefix and suffix.
   if ($is_input_group) {
-    $prefix = isset($element['#field_prefix']) ? theme('radix_input_group_addon', array('content' => $element['#field_prefix'])) . ' ' : '';
+    $prefix = '<div class="input-group">';
+    $prefix .= isset($element['#field_prefix']) ? theme('radix_input_group_addon', array('content' => $element['#field_prefix'])) . ' ' : '';
     $suffix = isset($element['#field_suffix']) ? ' ' . theme('radix_input_group_addon', array('content' => $element['#field_suffix'])) : '';
+    $suffix .= '</div>';
   }
   else {
     $prefix = isset($element['#field_prefix']) ? '<span class="field-prefix">' . $element['#field_prefix'] . '</span> ' : '';
-- 
2.9.0