diff options
| author | Mark Otto <[email protected]> | 2012-04-07 23:41:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-07 23:41:27 -0700 |
| commit | 48063afb3a53c762bb950e4246a06a3682707aed (patch) | |
| tree | 204de2d2a54f959d12067a046859f445234d34e0 /docs/assets | |
| parent | 0b2d23d4439429cdbd0758d01f4602e6b2afde6d (diff) | |
| parent | 08fee005a8a879498255611c18dede3112896d3d (diff) | |
| download | bootstrap-48063afb3a53c762bb950e4246a06a3682707aed.tar.xz bootstrap-48063afb3a53c762bb950e4246a06a3682707aed.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 57423 -> 57451 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-typeahead.js | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex fc922efd2..cb1e91545 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index f366bea63..3876e6307 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -204,11 +204,13 @@ break case 38: // up arrow + if (e.type != 'keydown') break e.preventDefault() this.prev() break case 40: // down arrow + if (e.type != 'keydown') break e.preventDefault() this.next() break |