Skip to content

Commit 3183165

Browse files
committed
Merge branch 'master' of github.com:t0m/select2-bootstrap-css
2 parents 56d2255 + 967616f commit 3183165

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

lib/select2-bootstrap.less

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Compatible with select2 3.3.2 and bootstrap 2.3.1
44
* MIT License
55
*/
6-
6+
77
.select2-container {
88
vertical-align: middle;
99
&.input-mini { width: 60px; }
@@ -50,9 +50,11 @@
5050
line-height: 27px;
5151
}
5252

53+
.select2-drop.select2-drop-active,
5354
.select2-container-active .select2-choice,
5455
.select2-container-multi.select2-container-active .select2-choices {
5556
border-color: rgba(82, 168, 236, 0.8);
57+
border-color: #ccc\0;
5658
outline: none;
5759
.box-shadow(~"inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6)");
5860
}
@@ -86,9 +88,9 @@
8688
}
8789

8890
/**
89-
* This stops the quick flash when a native selectbox is shown and
90-
* then replaced by a select2 input when javascript kicks in. This can be
91-
* removed if javascript is not present
91+
* This stops the quick flash when a native selectbox is shown and
92+
* then replaced by a select2 input when javascript kicks in. This can be
93+
* removed if javascript is not present
9294
*/
9395

9496
select.select2 {

lib/select2-bootstrap.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Compatible with select2 3.3.2 and bootstrap 2.3.1
44
* MIT License
55
*/
6-
6+
77
.select2-container {
88
vertical-align: middle;
99
&.input-mini { width: 60px; }
@@ -50,9 +50,11 @@
5050
line-height: 27px;
5151
}
5252

53+
.select2-drop.select2-drop-active,
5354
.select2-container-active .select2-choice,
5455
.select2-container-multi.select2-container-active .select2-choices {
5556
border-color: rgba(82, 168, 236, 0.8);
57+
border-color: #ccc\0;
5658
outline: none;
5759
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6));
5860
}
@@ -86,9 +88,9 @@
8688
}
8789

8890
/**
89-
* This stops the quick flash when a native selectbox is shown and
90-
* then replaced by a select2 input when javascript kicks in. This can be
91-
* removed if javascript is not present
91+
* This stops the quick flash when a native selectbox is shown and
92+
* then replaced by a select2 input when javascript kicks in. This can be
93+
* removed if javascript is not present
9294
*/
9395

9496
select.select2 {

select2-bootstrap.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@
6565
line-height: 27px;
6666
}
6767

68+
.select2-drop.select2-drop-active,
6869
.select2-container-active .select2-choice,
6970
.select2-container-multi.select2-container-active .select2-choices {
7071
border-color: rgba(82, 168, 236, 0.8);
72+
border-color: #ccc\0;
7173
outline: none;
7274
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
7375
-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 @@
103105
}
104106

105107
/**
106-
* This stops the quick flash when a native selectbox is shown and
107-
* then replaced by a select2 input when javascript kicks in. This can be
108-
* removed if javascript is not present
108+
* This stops the quick flash when a native selectbox is shown and
109+
* then replaced by a select2 input when javascript kicks in. This can be
110+
* removed if javascript is not present
109111
*/
110112
select.select2 {
111113
height: 28px;

0 commit comments

Comments
 (0)