mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-18 15:54:26 +01:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
This commit is contained in:
commit
576ae2f561
@ -357,7 +357,7 @@
|
||||
<div class="span5">
|
||||
<p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p>
|
||||
<ol>
|
||||
<li>Use the compiled responsive version, bootstrap-reponsive.css</li>
|
||||
<li>Use the compiled responsive version, bootstrap-responsive.css</li>
|
||||
<li>Add @import "responsive.less" and recompile Bootstrap</li>
|
||||
<li>Modify and recompile responsive.less as a separate</li>
|
||||
</ol>
|
||||
|
4
docs/templates/pages/scaffolding.mustache
vendored
4
docs/templates/pages/scaffolding.mustache
vendored
@ -292,7 +292,7 @@
|
||||
<div class="span5">
|
||||
<p>{{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}</p>
|
||||
<ol>
|
||||
<li>{{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}</li>
|
||||
<li>{{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}</li>
|
||||
<li>{{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}</li>
|
||||
<li>{{_i}}Modify and recompile responsive.less as a separate{{/i}}</li>
|
||||
</ol>
|
||||
@ -314,4 +314,4 @@
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
2
js/bootstrap-typeahead.js
vendored
2
js/bootstrap-typeahead.js
vendored
@ -79,7 +79,7 @@
|
||||
|
||||
q = this.query.toLowerCase()
|
||||
|
||||
items = this.data.filter(function (item) {
|
||||
items = jQuery.grep(this.data, function (item) {
|
||||
if (that.matcher(item, q)) return item
|
||||
})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user