From 07a5d55f01c826c136b58c89907be76a203d5eaa Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 16 Mar 2015 14:41:03 -0700 Subject: tooltip: line-height: 1.4 => @line-height-base --- less/tooltip.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/tooltip.less') diff --git a/less/tooltip.less b/less/tooltip.less index 9d5684743..c0dfd55ce 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -12,7 +12,7 @@ font-family: @font-family-base; font-size: @font-size-small; font-weight: normal; - line-height: 1.4; + line-height: @line-height-base; .opacity(0); &.in { .opacity(@tooltip-opacity); } -- cgit v1.2.3 From 1bc9fb626c7f1829c3e86969a206091d93addca7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 16 Mar 2015 14:47:07 -0700 Subject: hoist text-decoration reset up from .tooltip-inner to .tooltip --- less/tooltip.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/tooltip.less') diff --git a/less/tooltip.less b/less/tooltip.less index c0dfd55ce..90207b54a 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -13,6 +13,7 @@ font-size: @font-size-small; font-weight: normal; line-height: @line-height-base; + text-decoration: none; .opacity(0); &.in { .opacity(@tooltip-opacity); } @@ -28,7 +29,6 @@ padding: 3px 8px; color: @tooltip-color; text-align: center; - text-decoration: none; background-color: @tooltip-bg; border-radius: @border-radius-base; } -- cgit v1.2.3 From 5359cb805439a6e3179fdd46d2fb009babd0f01b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 16 Mar 2015 14:48:49 -0700 Subject: Reset text/font properties more thoroughly for tooltips+popovers; fixes #15925 [skip sauce] --- less/tooltip.less | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'less/tooltip.less') diff --git a/less/tooltip.less b/less/tooltip.less index 90207b54a..b48d63e07 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -8,12 +8,11 @@ position: absolute; z-index: @zindex-tooltip; display: block; - // Reset font and text properties given new insertion method - font-family: @font-family-base; + // 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. + .reset-text(); font-size: @font-size-small; - font-weight: normal; - line-height: @line-height-base; - text-decoration: none; + .opacity(0); &.in { .opacity(@tooltip-opacity); } -- cgit v1.2.3