diff options
author | Chris Rebert <code@rebertia.com> | 2015-03-17 00:48:49 +0300 |
---|---|---|
committer | Chris Rebert <code@rebertia.com> | 2015-04-08 10:52:10 +0300 |
commit | 5359cb805439a6e3179fdd46d2fb009babd0f01b (patch) | |
tree | d3c5a6da3835c218449639b883b5108d4c56b0eb /less | |
parent | 1bc9fb626c7f1829c3e86969a206091d93addca7 (diff) |
Reset text/font properties more thoroughly for tooltips+popovers; fixes #15925
[skip sauce]
Diffstat (limited to 'less')
-rw-r--r-- | less/mixins.less | 1 | ||||
-rw-r--r-- | less/mixins/reset-text.less | 18 | ||||
-rw-r--r-- | less/popovers.less | 12 | ||||
-rw-r--r-- | less/tooltip.less | 9 |
4 files changed, 27 insertions, 13 deletions
diff --git a/less/mixins.less b/less/mixins.less index af4408fc2d..e6f9fe684b 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -11,6 +11,7 @@ @import "mixins/responsive-visibility.less"; @import "mixins/size.less"; @import "mixins/tab-focus.less"; +@import "mixins/reset-text.less"; @import "mixins/text-emphasis.less"; @import "mixins/text-overflow.less"; @import "mixins/vendor-prefixes.less"; diff --git a/less/mixins/reset-text.less b/less/mixins/reset-text.less new file mode 100644 index 0000000000..58dd4d19b4 --- /dev/null +++ b/less/mixins/reset-text.less @@ -0,0 +1,18 @@ +.reset-text() { + font-family: @font-family-base; + // We deliberately do NOT reset font-size. + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: @line-height-base; + text-align: left; // Fallback for where `start` is not supported + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; +} diff --git a/less/popovers.less b/less/popovers.less index 2748eead13..3a62a6455a 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -11,12 +11,11 @@ display: none; max-width: @popover-max-width; padding: 1px; - // Reset font and text properties given new insertion method - font-family: @font-family-base; + // Our parent element can be arbitrary since popovers 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-base; - font-weight: normal; - line-height: @line-height-base; - text-align: left; + background-color: @popover-bg; background-clip: padding-box; border: 1px solid @popover-fallback-border-color; @@ -24,9 +23,6 @@ border-radius: @border-radius-large; .box-shadow(0 5px 10px rgba(0,0,0,.2)); - // Overrides for proper insertion - white-space: normal; - // Offset the popover to account for the popover arrow &.top { margin-top: -@popover-arrow-width; } &.right { margin-left: @popover-arrow-width; } diff --git a/less/tooltip.less b/less/tooltip.less index 90207b54a6..b48d63e07a 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); } |