mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-30 11:10:23 +00:00
fix carousel and rebuild js
This commit is contained in:
parent
b5af762ef5
commit
404e4d9e9a
6 changed files with 10 additions and 7 deletions
5
docs/assets/css/bootstrap-responsive.css
vendored
5
docs/assets/css/bootstrap-responsive.css
vendored
|
|
@ -1018,7 +1018,7 @@
|
|||
position: static;
|
||||
top: auto;
|
||||
left: auto;
|
||||
display: block;
|
||||
display: none;
|
||||
float: none;
|
||||
max-width: none;
|
||||
padding: 0;
|
||||
|
|
@ -1032,6 +1032,9 @@
|
|||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.nav-collapse .open > .dropdown-menu {
|
||||
display: block;
|
||||
}
|
||||
.nav-collapse .dropdown-menu:before,
|
||||
.nav-collapse .dropdown-menu:after {
|
||||
display: none;
|
||||
|
|
|
|||
2
docs/assets/js/bootstrap-carousel.js
vendored
2
docs/assets/js/bootstrap-carousel.js
vendored
|
|
@ -168,7 +168,7 @@
|
|||
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||
var $this = $(this), href
|
||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
|
||||
, options = $.extend({}, $target.data(), $this.data())
|
||||
$target.carousel(options)
|
||||
e.preventDefault()
|
||||
})
|
||||
|
|
|
|||
2
docs/assets/js/bootstrap-dropdown.js
vendored
2
docs/assets/js/bootstrap-dropdown.js
vendored
|
|
@ -101,7 +101,7 @@
|
|||
|
||||
function clearMenus() {
|
||||
$(toggle).each(function () {
|
||||
getParent($(this)).removeClass("open")
|
||||
getParent($(this)).removeClass('open')
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
4
docs/assets/js/bootstrap.js
vendored
4
docs/assets/js/bootstrap.js
vendored
|
|
@ -407,7 +407,7 @@
|
|||
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||
var $this = $(this), href
|
||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
|
||||
, options = $.extend({}, $target.data(), $this.data())
|
||||
$target.carousel(options)
|
||||
e.preventDefault()
|
||||
})
|
||||
|
|
@ -670,7 +670,7 @@
|
|||
|
||||
function clearMenus() {
|
||||
$(toggle).each(function () {
|
||||
getParent($(this)).removeClass("open")
|
||||
getParent($(this)).removeClass('open')
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
2
docs/assets/js/bootstrap.min.js
vendored
2
docs/assets/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
2
js/bootstrap-carousel.js
vendored
2
js/bootstrap-carousel.js
vendored
|
|
@ -168,7 +168,7 @@
|
|||
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||
var $this = $(this), href
|
||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
|
||||
, options = $.extend({}, $target.data(), $this.data())
|
||||
$target.carousel(options)
|
||||
e.preventDefault()
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in a new issue