Merge pull request #132 from wiserstudios/master

Fix Bootstrap 3.0 Inline Form Styling Bug

Author: thephw

README.md

@@ -49,8 +49,12 @@ When activating the plugin, you may include an object containing options for the
 
 ## Live Example
 
+### Bootstrap 2.0 Version
 http://dl.dropbox.com/u/21368/bootstrap-combobox/index.html
 
+### Bootstrap 3.0 Version
+http://bootstrap-combobox-test.herokuapp.com/
+
 ## License
 
 Licensed under the Apache License, Version 2.0

css/bootstrap-combobox.css

@@ -4,6 +4,10 @@
   margin-bottom: 0;
   vertical-align: top;
 }
+.form-search .combobox-container .input-group-addon,
+.form-inline .combobox-container .input-group-addon {
+  width: auto;
+}
 .combobox-selected .caret {
   display: none;
 }

less/combobox.less

@@ -4,6 +4,9 @@
     display: inline-block;
     margin-bottom: 0;
     vertical-align: top;
+    .input-group-addon{
+      width: auto;
+    }
   }
 }