From df6facf66e19566b962327899f981258b695076c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 May 2016 11:12:22 -0700 Subject: [PATCH 1/2] Alternate fix to #19006: Add a single variable for controlling that inner 1px padding on .popover --- scss/_popover.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_popover.scss b/scss/_popover.scss index 9ea8c14758..a5de83c379 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -5,7 +5,7 @@ z-index: $zindex-popover; display: block; max-width: $popover-max-width; - padding: 1px; + padding: $popover-inner-padding; // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element. // So reset our font and text properties to avoid inheriting weird values. @include reset-text(); diff --git a/scss/_variables.scss b/scss/_variables.scss index d50d8e281e..d129f9fee4 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -606,6 +606,7 @@ $tooltip-arrow-color: $tooltip-bg !default; // Popovers +$popover-inner-padding: 1px !default; $popover-bg: #fff !default; $popover-max-width: 276px !default; $popover-border-width: $border-width !default; From a6b797d17b995774de646658bfb91ad8a445ef2f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 May 2016 11:12:40 -0700 Subject: [PATCH 2/2] Restore hiding of the .popover-title with :empty --- scss/_popover.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scss/_popover.scss b/scss/_popover.scss index a5de83c379..6e6fe3c9cb 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -112,6 +112,10 @@ border-bottom: $popover-border-width solid darken($popover-title-bg, 5%); $offset-border-width: ($border-width / $font-size-root); @include border-radius(($border-radius-lg - $offset-border-width) ($border-radius-lg - $offset-border-width) 0 0); + + &:empty { + display: none; + } } .popover-content {