Skip to content

Commit 4eaeea8

Browse files
committed
rebuild and fix test
1 parent bcd5097 commit 4eaeea8

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

docs/assets/css/bootstrap.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4674,15 +4674,15 @@ a.badge:hover {
46744674
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
46754675
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
46764676
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
4677+
-webkit-box-sizing: border-box;
4678+
-moz-box-sizing: border-box;
4679+
-ms-box-sizing: border-box;
4680+
box-sizing: border-box;
46774681
-webkit-transition: width 0.6s ease;
46784682
-moz-transition: width 0.6s ease;
46794683
-ms-transition: width 0.6s ease;
46804684
-o-transition: width 0.6s ease;
46814685
transition: width 0.6s ease;
4682-
-webkit-box-sizing: border-box;
4683-
-moz-box-sizing: border-box;
4684-
-ms-box-sizing: border-box;
4685-
box-sizing: border-box;
46864686
}
46874687

46884688
.progress-striped .bar {

docs/assets/js/bootstrap-tooltip.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@
8484
, leave: function (e) {
8585
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
8686

87+
if (this.timeout) clearTimeout(this.timeout)
8788
if (!self.options.delay || !self.options.delay.hide) return self.hide()
8889

89-
clearTimeout(this.timeout)
9090
self.hoverState = 'out'
9191
this.timeout = setTimeout(function() {
9292
if (self.hoverState == 'out') self.hide()
@@ -272,4 +272,4 @@
272272
, delay: 0
273273
}
274274

275-
}(window.jQuery);
275+
}(window.jQuery);

docs/assets/js/bootstrap.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,9 +968,9 @@
968968
, leave: function (e) {
969969
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
970970

971+
if (this.timeout) clearTimeout(this.timeout)
971972
if (!self.options.delay || !self.options.delay.hide) return self.hide()
972973

973-
clearTimeout(this.timeout)
974974
self.hoverState = 'out'
975975
this.timeout = setTimeout(function() {
976976
if (self.hoverState == 'out') self.hide()
@@ -1156,7 +1156,8 @@
11561156
, delay: 0
11571157
}
11581158

1159-
}(window.jQuery);/* ===========================================================
1159+
}(window.jQuery);
1160+
/* ===========================================================
11601161
* bootstrap-popover.js v2.0.3
11611162
* http://twitter.github.com/bootstrap/javascript.html#popovers
11621163
* ===========================================================

0 commit comments

Comments
 (0)