fix carousel and rebuild js
This commit is contained in:
parent
b5af762ef5
commit
404e4d9e9a
|
@ -1018,7 +1018,7 @@
|
||||||
position: static;
|
position: static;
|
||||||
top: auto;
|
top: auto;
|
||||||
left: auto;
|
left: auto;
|
||||||
display: block;
|
display: none;
|
||||||
float: none;
|
float: none;
|
||||||
max-width: none;
|
max-width: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
@ -1032,6 +1032,9 @@
|
||||||
-moz-box-shadow: none;
|
-moz-box-shadow: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
.nav-collapse .open > .dropdown-menu {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
.nav-collapse .dropdown-menu:before,
|
.nav-collapse .dropdown-menu:before,
|
||||||
.nav-collapse .dropdown-menu:after {
|
.nav-collapse .dropdown-menu:after {
|
||||||
display: none;
|
display: none;
|
||||||
|
|
|
@ -168,7 +168,7 @@
|
||||||
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||||
var $this = $(this), href
|
var $this = $(this), href
|
||||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
, $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)
|
$target.carousel(options)
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
})
|
})
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
|
|
||||||
function clearMenus() {
|
function clearMenus() {
|
||||||
$(toggle).each(function () {
|
$(toggle).each(function () {
|
||||||
getParent($(this)).removeClass("open")
|
getParent($(this)).removeClass('open')
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -407,7 +407,7 @@
|
||||||
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||||
var $this = $(this), href
|
var $this = $(this), href
|
||||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
, $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)
|
$target.carousel(options)
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
})
|
})
|
||||||
|
@ -670,7 +670,7 @@
|
||||||
|
|
||||||
function clearMenus() {
|
function clearMenus() {
|
||||||
$(toggle).each(function () {
|
$(toggle).each(function () {
|
||||||
getParent($(this)).removeClass("open")
|
getParent($(this)).removeClass('open')
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -168,7 +168,7 @@
|
||||||
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||||
var $this = $(this), href
|
var $this = $(this), href
|
||||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
, $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)
|
$target.carousel(options)
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue