aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2017-05-12 16:08:51 +0200
committerJohann-S <[email protected]>2017-05-14 11:41:19 +0200
commit2b403819b7faa07e9849885cd6ae672774e38553 (patch)
treee667f1856e3b1d2eae1a7fe74b5bb67d4efc2f1e
parentcc455c16c3363fed5b360cdaa780e612d10caf74 (diff)
downloadbootstrap-2b403819b7faa07e9849885cd6ae672774e38553.tar.xz
bootstrap-2b403819b7faa07e9849885cd6ae672774e38553.zip
Fix tooltip margin to be stick at their caller
-rw-r--r--scss/_tooltip.scss5
-rw-r--r--scss/_variables.scss2
2 files changed, 2 insertions, 5 deletions
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index d67dc4460..4eaaa1c58 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -3,6 +3,7 @@
position: absolute;
z-index: $zindex-tooltip;
display: block;
+ margin: $tooltip-margin;
// 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();
@@ -15,7 +16,6 @@
&.bs-tooltip-top {
padding: $tooltip-arrow-width 0;
- margin-top: -$tooltip-margin;
.arrow::before {
bottom: 0;
@@ -28,7 +28,6 @@
}
&.bs-tooltip-right {
padding: 0 $tooltip-arrow-width;
- margin-left: $tooltip-margin;
.arrow::before {
top: 50%;
@@ -41,7 +40,6 @@
}
&.bs-tooltip-bottom {
padding: $tooltip-arrow-width 0;
- margin-top: $tooltip-margin;
.arrow::before {
top: 0;
@@ -54,7 +52,6 @@
}
&.bs-tooltip-left {
padding: 0 $tooltip-arrow-width;
- margin-left: -$tooltip-margin;
.arrow::before {
top: 50%;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index fccee460b..1bcabdc47 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -696,7 +696,7 @@ $tooltip-bg: $black !default;
$tooltip-opacity: .9 !default;
$tooltip-padding-y: 3px !default;
$tooltip-padding-x: 8px !default;
-$tooltip-margin: 3px !default;
+$tooltip-margin: 0 !default;
$tooltip-arrow-width: 5px !default;
$tooltip-arrow-color: $tooltip-bg !default;