mirror of
https://github.com/twbs/bootstrap.git
synced 2025-09-25 12:59:05 +02:00
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts: bootstrap-1.2.0.css bootstrap-1.2.0.min.css lib/patterns.less lib/scaffolding.less
This commit is contained in:
@@ -5,6 +5,7 @@ $(document).ready(function(){
|
||||
|
||||
prettyPrint();
|
||||
|
||||
|
||||
// scroll spy logic
|
||||
// ================
|
||||
|
||||
@@ -19,7 +20,6 @@ $(document).ready(function(){
|
||||
return $(id).offset().top;
|
||||
});
|
||||
|
||||
|
||||
function setButton(id) {
|
||||
nav.parent("li").removeClass('active');
|
||||
$(nav[$.inArray(id, targets)]).parent("li").addClass('active');
|
||||
@@ -48,10 +48,9 @@ $(document).ready(function(){
|
||||
// ===============================
|
||||
|
||||
$("body").bind("click", function (e) {
|
||||
$('a.menu').parent("li").removeClass("open");
|
||||
$('.dropdown-toggle, .menu').parent("li").removeClass("open");
|
||||
});
|
||||
|
||||
$("a.menu").click(function (e) {
|
||||
$(".dropdown-toggle, .menu").click(function (e) {
|
||||
var $li = $(this).parent("li").toggleClass('open');
|
||||
return false;
|
||||
});
|
||||
|
Reference in New Issue
Block a user