rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

fix carousel and rebuild js

Browse Source
This commit is contained in:
fat 2012-10-30 21:32:15 -07:00
parent b5af762ef5
commit 404e4d9e9a
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/assets/css/bootstrap-responsive.css vendored
View File

@ -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
View File

@ -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
View File

@ -101,7 +101,7 @@
function clearMenus() {
$(toggle).each(function () {
getParent($(this)).removeClass("open")
getParent($(this)).removeClass('open')
})
}

4
docs/assets/js/bootstrap.js vendored
View File

@ -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
View File

File diff suppressed because one or more lines are too long

2
js/bootstrap-carousel.js vendored
View File

@ -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()
})