From: Mark Otto Date: Mon, 10 Oct 2016 02:56:30 +0000 (-0700) Subject: Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog... X-Git-Tag: v4.0.0-alpha.5~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7f79b32f22d7f39138a7003272b54ceb3b12426;p=thirdparty%2Fbootstrap.git Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog-tooltip-arrow --- e7f79b32f22d7f39138a7003272b54ceb3b12426 diff --cc scss/_tooltip.scss index e8151af07d,23a18e7dee..37d296419b --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@@ -16,9 -14,9 +16,9 @@@ &.tooltip-top, &.bs-tether-element-attached-bottom { padding: $tooltip-arrow-width 0; - margin-top: -3px; + margin-top: -$tooltip-margin; - .tooltip-arrow { + .tooltip-inner:before { bottom: 0; left: 50%; margin-left: -$tooltip-arrow-width; @@@ -29,9 -28,9 +30,9 @@@ &.tooltip-right, &.bs-tether-element-attached-left { padding: 0 $tooltip-arrow-width; - margin-left: 3px; + margin-left: $tooltip-margin; - .tooltip-arrow { + .tooltip-inner:before { top: 50%; left: 0; margin-top: -$tooltip-arrow-width; @@@ -42,9 -42,9 +44,9 @@@ &.tooltip-bottom, &.bs-tether-element-attached-top { padding: $tooltip-arrow-width 0; - margin-top: 3px; + margin-top: $tooltip-margin; - .tooltip-arrow { + .tooltip-inner:before { top: 0; left: 50%; margin-left: -$tooltip-arrow-width; @@@ -55,9 -56,9 +58,9 @@@ &.tooltip-left, &.bs-tether-element-attached-right { padding: 0 $tooltip-arrow-width; - margin-left: -3px; + margin-left: -$tooltip-margin; - .tooltip-arrow { + .tooltip-inner:before { top: 50%; right: 0; margin-top: -$tooltip-arrow-width;