Merge pull request bootstrap-ruby#41 from slave2zeros/master

Form label class name error

Author: carloslopes

lib/bootstrap_form/form_builder.rb

@@ -12,7 +12,7 @@ class FormBuilder < ActionView::Helpers::FormBuilder
 
     def initialize(object_name, object, template, options, proc=nil)
       @style = options[:style]
-      @left_class = (options[:left] || default_left_class) + " control-label"
+      @left_class = options[:left] || default_left_class
       @right_class = options[:right] || default_right_class
       super
     end
@@ -151,6 +151,10 @@ def default_right_class
       "col-sm-10"
     end
 
+    def default_label_class
+      "control-label"
+    end
+
     def hide_class
       "sr-only" # still accessible for screen readers
     end
@@ -172,11 +176,12 @@ def prepend_and_append_input(input, prepend, append)
 
     def generate_label(name, options)
       if options
-        options[:class] = "#{options[:class]} #{left_class}".lstrip if horizontal?
+        options[:class] = "#{options[:class]} #{default_label_class}".lstrip
+        options[:class] << " #{left_class}" if horizontal?
         label(name, options[:text], options.except(:text))
       elsif horizontal?
         # no label. create an empty one to keep proper form alignment.
-        content_tag(:label, "", class: left_class)
+        content_tag(:label, "", class: "#{default_label_class} #{left_class}")
       end
     end