Merge pull request #13 from vieraleonel/bootstrap-form-inline-support

Support for Bootstrap's .form-inline.
select2 · Jun 8, 2015 · c8d5d19 · c8d5d19
2 parents 2b20696 + 2d9a1f7
commit c8d5d19
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/dist/select2-bootstrap.css b/dist/select2-bootstrap.css
@@ -562,3 +562,10 @@
 .form-control.select2-hidden-accessible {
   position: absolute !important;
 }
+
+/**
+ * Display override for inline forms
+*/
+.form-inline .select2-container--bootstrap {
+  display: inline-block;
+}
diff --git a/dist/select2-bootstrap.min.css b/dist/select2-bootstrap.min.css
diff --git a/docs/css/select2-bootstrap.css b/docs/css/select2-bootstrap.css
@@ -562,3 +562,10 @@
 .form-control.select2-hidden-accessible {
   position: absolute !important;
 }
+
+/**
+ * Display override for inline forms
+*/
+.form-inline .select2-container--bootstrap {
+  display: inline-block;
+}
diff --git a/src/select2-bootstrap.less b/src/select2-bootstrap.less
@@ -726,3 +726,11 @@
 .form-control.select2-hidden-accessible {
     position: absolute !important;
 }
+
+/**
+ * Display override for inline forms
+*/
+
+.form-inline .select2-container--bootstrap {
+    display: inline-block;
+}
diff --git a/src/select2-bootstrap.scss b/src/select2-bootstrap.scss
@@ -726,3 +726,11 @@ $clear-selection-color: $dropdown-arrow-color !default;
 .form-control.select2-hidden-accessible {
     position: absolute !important;
 }
+
+/**
+ * Display override for inline forms
+*/
+
+.form-inline .select2-container--bootstrap {
+    display: inline-block;
+}