mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

rebuild after merge

Browse Source
This commit is contained in:
Mark Otto
2012-09-05 10:04:28 -07:00
parent 5ff5d351bf
commit dfb3175d4b
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
-2
View File
@@ -2157,8 +2157,6 @@ table [class*=span],
/* White icons with optional class, or on hover/active states of certain elements */ /* White icons with optional class, or on hover/active states of certain elements */
.icon-white, .icon-white,
.nav-tabs > .active > a > [class^="icon-"],
.nav-tabs > .active > a > [class*=" icon-"],
.nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class^="icon-"],
.nav-pills > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class*=" icon-"],
.nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class^="icon-"],
docs/assets/js/bootstrap-typeahead.js
Vendored
+1 -1
View File
@@ -174,7 +174,7 @@
.on('keypress', $.proxy(this.keypress, this)) .on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this)) .on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) { if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keydown, this)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
docs/assets/js/bootstrap.js
Vendored
+1 -1
View File
@@ -1797,7 +1797,7 @@
.on('keypress', $.proxy(this.keypress, this)) .on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this)) .on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) { if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keydown, this)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
docs/assets/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long