From 2854c5c3fb65b709fbf32d05faccf7a294626cca Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Dec 2013 19:40:08 -0800 Subject: Fixes #11952: Refactor blockquote styles * Deprecate .pull-right class for .blockquote-reverse * Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content --- dist/js/bootstrap.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dist/js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 3518068f1e..3623bba599 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1573,15 +1573,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .parents('.active') .removeClass('active') - var selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' var active = $(selector) .parents('li') .addClass('active') - if (active.parent('.dropdown-menu').length) { + if (active.parent('.dropdown-menu').length) { active = active .closest('li.dropdown') .addClass('active') -- cgit v1.2.3