diff options
| author | Mark Otto <otto@github.com> | 2013-12-20 07:40:08 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-12-20 07:40:08 +0400 |
| commit | 2854c5c3fb65b709fbf32d05faccf7a294626cca (patch) | |
| tree | 4cb9ef9d2b7f54cf0721a32a6a87ca8ee5414b2d /dist/js | |
| parent | 81b1e6801faf71705a06e8e039a98b79b6c478c5 (diff) | |
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
Diffstat (limited to 'dist/js')
| -rw-r--r-- | dist/js/bootstrap.js | 8 |
1 files changed, 4 insertions, 4 deletions
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') |