1
0
mirror of synced 2024-11-25 06:16:08 +03:00

catch up to master:

This commit is contained in:
Igor Vaynberg 2013-03-25 09:12:08 -07:00
parent 94585c63ef
commit 768f61907c
11 changed files with 6182 additions and 3028 deletions

View File

@ -95,15 +95,34 @@
<div class="container">
<div class="hero-unit">
<div class="hero-unit" style="padding: 30px;">
<h1>Select2 {{ page.version }}</h1>
<p>Select2 is a jQuery based replacement for select boxes.
It supports searching, remote data sets, and infinite scrolling of results.
Look and feel of Select2 is based on the excellent
<a href="http://harvesthq.github.com/chosen/">Chosen</a> library.</p>
</p>
<p>
<a class="btn btn-primary btn-large" href="https://github.com/ivaynberg/select2">Learn more on GitHub&raquo;</a>
<a class="btn btn-success btn-large" href="https://github.com/ivaynberg/select2/tags">Download&raquo;</a>
<ul class="inline" style="text-align: center">
<li>
<a class="btn btn-primary" href="https://github.com/ivaynberg/select2">Learn more on
GitHub&raquo;</a>
</li>
<li>
<a class="btn btn-success"
href="https://github.com/ivaynberg/select2/tags">Download&raquo;</a>
</li>
<li>
<iframe src="http://ghbtns.com/github-btn.html?user=ivaynberg&repo=select2&type=watch&count=true&size=large"
allowtransparency="true" frameborder="0" scrolling="0" width="150" height="30" style="vertical-align: middle"></iframe>
</li>
<li>
<iframe src="http://ghbtns.com/github-btn.html?user=ivaynberg&repo=select2&type=fork&count=true&size=large"
allowtransparency="true" frameborder="0" scrolling="0" width="150" height="30" style="vertical-align: middle"></iframe>
</li>
<li>
<iframe src="http://ghbtns.com/github-btn.html?user=ivaynberg&repo=select2&type=follow&count=true&size=large"
allowtransparency="true" frameborder="0" scrolling="0" width="190" height="30" style="vertical-align: middle"></iframe>
</li>
</ul>
</p>
</div>

1418
bootstrap/css/bootstrap-responsive.css vendored Executable file → Normal file

File diff suppressed because it is too large Load Diff

13
bootstrap/css/bootstrap-responsive.min.css vendored Executable file → Normal file

File diff suppressed because one or more lines are too long

5450
bootstrap/css/bootstrap.css vendored Executable file → Normal file

File diff suppressed because it is too large Load Diff

641
bootstrap/css/bootstrap.min.css vendored Executable file → Normal file

File diff suppressed because one or more lines are too long

BIN
bootstrap/img/glyphicons-halflings-white.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
bootstrap/img/glyphicons-halflings.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 12 KiB

1288
bootstrap/js/bootstrap.js vendored Executable file → Normal file

File diff suppressed because it is too large Load Diff

7
bootstrap/js/bootstrap.min.js vendored Executable file → Normal file

File diff suppressed because one or more lines are too long

@ -1 +1 @@
Subproject commit 9acfc6faa5448730cb5e82f2277b80080df3d7f5
Subproject commit 94c1706c67281245a05c7d2d6cb0c360b9f9e81a

View File

@ -12,6 +12,7 @@
<div style="padding: 10px; margin: 10px;">
<br/><br/><br/>
<input type="text" size="30"/><br/>
<label for="e4">Label: </label>
<select id="e4" style="width:300px" class="populate">
<option></option>
<option value="AK">Alaska</option>
@ -37,6 +38,7 @@
<input type="text" size="30"/>
</div>
<label for="e6">Label: </label>
<input type="hidden" class="bigdrop" id="e6" style="width:600px" value="16340"/>
<script>
@ -97,7 +99,7 @@
$("#e6").select2({
placeholder: "Search for a movie",
minimumInputLength: 1,
multiple:false,
multiple:true,
ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
dataType: 'jsonp',