Skip to content

Commit bc32cec

Browse files
committed
Updated gh-pages.
1 parent 71a9832 commit bc32cec

File tree

6 files changed

+96
-40
lines changed

6 files changed

+96
-40
lines changed

demo/css/bootstrap.min.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

demo/img/glyphicons-halflings.png

-12.5 KB
Binary file not shown.

demo/index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<html>
33
<head>
44
<title></title>
5-
<script src="js/jquery-1.9.1.min.js"></script>
6-
<script src="js/select2.min.js"></script>
5+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
6+
<script src="https://raw.github.com/ivaynberg/select2/3.3.2/select2.min.js"></script>
7+
<!-- <link rel="stylesheet" type="text/css" href="https://raw.github.com/ivaynberg/select2/3.3.2/select2.css"/> -->
78
<link rel="stylesheet" type="text/css" href="css/select2.css"/>
8-
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
9-
<link rel="stylesheet" type="text/css" href="../select2-bootstrap.css"/>
9+
<link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
10+
<link rel="stylesheet" type="text/css" href="select2-bootstrap.css"/>
1011
</head>
1112
<body style="margin:20px;">
1213
<form class="form-horizontal">

demo/js/jquery-1.9.1.min.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

demo/js/select2.min.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

demo/select2-bootstrap.css

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/**
2+
* Select2 Bootstrap CSS 1.0
3+
* Compatible with select2 3.3.2 and bootstrap 2.3.1
4+
* MIT License
5+
*/
6+
.select2-container {
7+
vertical-align: middle;
8+
}
9+
10+
.select2-container .select2-choice,
11+
.select2-container-multi .select2-choices {
12+
height: 28px;
13+
line-height: 29px;
14+
border: 1px solid #cccccc;
15+
-webkit-border-radius: 4px;
16+
-moz-border-radius: 4px;
17+
border-radius: 4px;
18+
background: none;
19+
background-color: white;
20+
filter: none;
21+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
22+
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
23+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
24+
}
25+
26+
.select2-container .select2-choice div,
27+
.select2-container.select2-container-disabled .select2-choice div {
28+
border-left: none;
29+
background: none;
30+
filter: none;
31+
}
32+
33+
.control-group.error [class^="select2-choice"] {
34+
border-color: #b94a48;
35+
}
36+
37+
.select2-container-multi .select2-choices .select2-search-field {
38+
height: 28px;
39+
line-height: 27px;
40+
}
41+
42+
.select2-container-active .select2-choice,
43+
.select2-container-multi.select2-container-active .select2-choices {
44+
border-color: rgba(82, 168, 236, 0.8);
45+
outline: none;
46+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
47+
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
48+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
49+
}
50+
51+
[class^="input-"] .select2-container {
52+
font-size: 14px;
53+
}
54+
55+
.input-prepend [class^="select2-choice"] {
56+
border-top-left-radius: 0;
57+
border-bottom-left-radius: 0;
58+
}
59+
60+
.input-append [class^="select2-choice"] {
61+
border-top-right-radius: 0;
62+
border-bottom-right-radius: 0;
63+
}
64+
65+
.select2-dropdown-open [class^="select2-choice"] {
66+
border-bottom-left-radius: 0;
67+
border-bottom-right-radius: 0;
68+
}
69+
70+
.select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
71+
border-top-left-radius: 0;
72+
border-top-right-radius: 0;
73+
}
74+
75+
[class^="input-"] [class^="select2-choice"] > div {
76+
display: none;
77+
}
78+
79+
[class^="input-"] .select2-offscreen {
80+
position: absolute;
81+
}
82+
83+
/**
84+
* This stops the quick flash when a native selectbox is shown and
85+
* then replaced by a select2 input when javascript kicks in. This can be
86+
* removed if javascript is not present
87+
*/
88+
select.select2 {
89+
height: 28px;
90+
visibility: hidden;
91+
}

0 commit comments

Comments
 (0)