Merge branch 'master' of github.com:t0m/select2-bootstrap-css

michaek · michaek · commit 31831656440c · 2013-09-20T16:11:28.000-04:00
diff --git a/lib/select2-bootstrap.less b/lib/select2-bootstrap.less
@@ -3,7 +3,7 @@
  * Compatible with select2 3.3.2 and bootstrap 2.3.1
  * MIT License
  */
- 
+
 .select2-container {
   vertical-align: middle;
   &.input-mini       { width: 60px; }
@@ -50,9 +50,11 @@
   line-height: 27px;
 }
 
+.select2-drop.select2-drop-active,
 .select2-container-active .select2-choice,
 .select2-container-multi.select2-container-active .select2-choices {
   border-color: rgba(82, 168, 236, 0.8);
+  border-color: #ccc\0;
   outline: none;
   .box-shadow(~"inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6)");
 }
@@ -86,9 +88,9 @@
 }
 
 /**
- * This stops the quick flash when a native selectbox is shown and 
- * then replaced by a select2 input when javascript kicks in. This can be 
- * removed if javascript is not present 
+ * This stops the quick flash when a native selectbox is shown and
+ * then replaced by a select2 input when javascript kicks in. This can be
+ * removed if javascript is not present
  */
 
 select.select2 {
diff --git a/lib/select2-bootstrap.scss b/lib/select2-bootstrap.scss
@@ -3,7 +3,7 @@
  * Compatible with select2 3.3.2 and bootstrap 2.3.1
  * MIT License
  */
- 
+
 .select2-container {
   vertical-align: middle;
   &.input-mini       { width: 60px; }
@@ -50,9 +50,11 @@
   line-height: 27px;
 }
 
+.select2-drop.select2-drop-active,
 .select2-container-active .select2-choice,
 .select2-container-multi.select2-container-active .select2-choices {
   border-color: rgba(82, 168, 236, 0.8);
+  border-color: #ccc\0;
   outline: none;
   @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6));
 }
@@ -86,9 +88,9 @@
 }
 
 /**
- * This stops the quick flash when a native selectbox is shown and 
- * then replaced by a select2 input when javascript kicks in. This can be 
- * removed if javascript is not present 
+ * This stops the quick flash when a native selectbox is shown and
+ * then replaced by a select2 input when javascript kicks in. This can be
+ * removed if javascript is not present
  */
 
 select.select2 {
diff --git a/select2-bootstrap.css b/select2-bootstrap.css
@@ -65,9 +65,11 @@
   line-height: 27px;
 }
 
+.select2-drop.select2-drop-active,
 .select2-container-active .select2-choice,
 .select2-container-multi.select2-container-active .select2-choices {
   border-color: rgba(82, 168, 236, 0.8);
+  border-color: #ccc\0;
   outline: none;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -103,9 +105,9 @@
 }
 
 /**
- * This stops the quick flash when a native selectbox is shown and 
- * then replaced by a select2 input when javascript kicks in. This can be 
- * removed if javascript is not present 
+ * This stops the quick flash when a native selectbox is shown and
+ * then replaced by a select2 input when javascript kicks in. This can be
+ * removed if javascript is not present
  */
 select.select2 {
   height: 28px;
