diff options
| author | Andres Galante <[email protected]> | 2017-11-06 14:29:12 -0300 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-11-06 09:29:12 -0800 |
| commit | 058123440fbfcdf06e48b84ed855e100ffda1f3f (patch) | |
| tree | c4683db5a6e9d3e8c9a92d7b48d75ad0663097b0 | |
| parent | b931070bd7becb0c9ab67d323ab90432a0bfafc1 (diff) | |
| download | bootstrap-058123440fbfcdf06e48b84ed855e100ffda1f3f.tar.xz bootstrap-058123440fbfcdf06e48b84ed855e100ffda1f3f.zip | |
Convert px values to rem on tooltip variables (#23468)
* converts px valures to rem on tooltip variables
* keep as px to match popover changes
| -rw-r--r-- | scss/_tooltip.scss | 8 | ||||
| -rw-r--r-- | scss/_variables.scss | 23 |
2 files changed, 15 insertions, 16 deletions
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss index 7b5db1cf2..b03139c91 100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@ -34,7 +34,7 @@ } .arrow::before { - margin-left: -($tooltip-arrow-width - 2); + margin-left: -$tooltip-arrow-width; content: ""; border-width: $tooltip-arrow-width $tooltip-arrow-width 0; border-top-color: $tooltip-arrow-color; @@ -47,7 +47,7 @@ } .arrow::before { - margin-top: -($tooltip-arrow-width - 2); + margin-top: -$tooltip-arrow-width; content: ""; border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0; border-right-color: $tooltip-arrow-color; @@ -60,7 +60,7 @@ } .arrow::before { - margin-left: -($tooltip-arrow-width - 2); + margin-left: -$tooltip-arrow-width; content: ""; border-width: 0 $tooltip-arrow-width $tooltip-arrow-width; border-bottom-color: $tooltip-arrow-color; @@ -74,7 +74,7 @@ .arrow::before { right: 0; - margin-top: -($tooltip-arrow-width - 2); + margin-top: -($tooltip-arrow-width); content: ""; border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width; border-left-color: $tooltip-arrow-color; diff --git a/scss/_variables.scss b/scss/_variables.scss index 69cd5d34e..a1f31b9b0 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -665,18 +665,17 @@ $card-columns-margin: $card-spacer-y !default; // Tooltips -$tooltip-max-width: 200px !default; -$tooltip-color: $white !default; -$tooltip-bg: $black !default; -$tooltip-opacity: .9 !default; -$tooltip-padding-y: 3px !default; -$tooltip-padding-x: 8px !default; -$tooltip-margin: 0 !default; - - -$tooltip-arrow-width: 5px !default; -$tooltip-arrow-height: 5px !default; -$tooltip-arrow-color: $tooltip-bg !default; +$tooltip-max-width: 200px !default; +$tooltip-color: $white !default; +$tooltip-bg: $black !default; +$tooltip-opacity: .9 !default; +$tooltip-padding-y: .25rem !default; +$tooltip-padding-x: .5rem !default; +$tooltip-margin: 0 !default; + +$tooltip-arrow-width: .4rem !default; +$tooltip-arrow-height: $tooltip-arrow-width !default; +$tooltip-arrow-color: $tooltip-bg !default; // Popovers |