mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog-tooltip-arrow

Browse Source
This commit is contained in:
Mark Otto
2016-10-09 19:56:30 -07:00
parent ef5bbffd55 8ef66df6d7
commit e7f79b32f2
4 changed files with 90 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/popover.js
View File

@@ -28,7 +28,6 @@ const Popover = (($) => {
trigger : 'click', trigger : 'click',
content : '', content : '',
template : '<div class="popover" role="tooltip">' template : '<div class="popover" role="tooltip">'
+ '<div class="popover-arrow"></div>'
+ '<h3 class="popover-title"></h3>' + '<h3 class="popover-title"></h3>'
+ '<div class="popover-content"></div></div>' + '<div class="popover-content"></div></div>'
}) })
@@ -44,8 +43,7 @@ const Popover = (($) => {
const Selector = { const Selector = {
TITLE : '.popover-title', TITLE : '.popover-title',
CONTENT : '.popover-content', CONTENT : '.popover-content'
ARROW : '.popover-arrow'
} }
const Event = { const Event = {

1
js/src/tooltip.js
View File

@@ -38,7 +38,6 @@ const Tooltip = (($) => {
const Default = { const Default = {
animation : true, animation : true,
template : '<div class="tooltip" role="tooltip">' template : '<div class="tooltip" role="tooltip">'
+ '<div class="tooltip-arrow"></div>'
+ '<div class="tooltip-inner"></div></div>', + '<div class="tooltip-inner"></div></div>',
trigger : 'hover focus', trigger : 'hover focus',
title : '', title : '',

124
scss/_popover.scss
View File

@@ -25,19 +25,22 @@
&.bs-tether-element-attached-bottom { &.bs-tether-element-attached-bottom {
margin-top: -$popover-arrow-width; margin-top: -$popover-arrow-width;
.popover-arrow { &::before,
bottom: -$popover-arrow-outer-width; &::after {
left: 50%; left: 50%;
border-bottom-width: 0;
}
&::before {
bottom: -$popover-arrow-outer-width;
margin-left: -$popover-arrow-outer-width; margin-left: -$popover-arrow-outer-width;
border-top-color: $popover-arrow-outer-color; border-top-color: $popover-arrow-outer-color;
border-bottom-width: 0; }
&::after {
bottom: 1px; &::after {
margin-left: -$popover-arrow-width; bottom: -($popover-arrow-outer-width - 1);
content: ""; margin-left: -$popover-arrow-width;
border-top-color: $popover-arrow-color; border-top-color: $popover-arrow-color;
border-bottom-width: 0;
}
} }
} }
@@ -45,19 +48,22 @@
&.bs-tether-element-attached-left { &.bs-tether-element-attached-left {
margin-left: $popover-arrow-width; margin-left: $popover-arrow-width;
.popover-arrow { &::before,
&::after {
top: 50%; top: 50%;
border-left-width: 0;
}
&::before {
left: -$popover-arrow-outer-width; left: -$popover-arrow-outer-width;
margin-top: -$popover-arrow-outer-width; margin-top: -$popover-arrow-outer-width;
border-right-color: $popover-arrow-outer-color; border-right-color: $popover-arrow-outer-color;
border-left-width: 0; }
&::after {
bottom: -$popover-arrow-width; &::after {
left: 1px; left: -($popover-arrow-outer-width - 1);
content: ""; margin-top: -($popover-arrow-outer-width - 1);
border-right-color: $popover-arrow-color; border-right-color: $popover-arrow-color;
border-left-width: 0;
}
} }
} }
@@ -65,19 +71,34 @@
&.bs-tether-element-attached-top { &.bs-tether-element-attached-top {
margin-top: $popover-arrow-width; margin-top: $popover-arrow-width;
.popover-arrow { &::before,
top: -$popover-arrow-outer-width; &::after {
left: 50%; left: 50%;
margin-left: -$popover-arrow-outer-width;
border-top-width: 0; border-top-width: 0;
}
&::before {
top: -$popover-arrow-outer-width;
margin-left: -$popover-arrow-outer-width;
border-bottom-color: $popover-arrow-outer-color; border-bottom-color: $popover-arrow-outer-color;
&::after { }
top: 1px;
margin-left: -$popover-arrow-width; &::after {
content: ""; top: -($popover-arrow-outer-width - 1);
border-top-width: 0; margin-left: -$popover-arrow-width;
border-bottom-color: $popover-arrow-color; border-bottom-color: $popover-title-bg;
} }
// This will remove the popover-title's border just below the arrow
.popover-title::before {
position: absolute;
top: 0;
left: 50%;
display: block;
width: 20px;
margin-left: -10px;
content: "";
border-bottom: 1px solid $popover-title-bg;
} }
} }
@@ -85,19 +106,22 @@
&.bs-tether-element-attached-right { &.bs-tether-element-attached-right {
margin-left: -$popover-arrow-width; margin-left: -$popover-arrow-width;
.popover-arrow { &::before,
&::after {
top: 50%; top: 50%;
border-right-width: 0;
}
&::before {
right: -$popover-arrow-outer-width; right: -$popover-arrow-outer-width;
margin-top: -$popover-arrow-outer-width; margin-top: -$popover-arrow-outer-width;
border-right-width: 0;
border-left-color: $popover-arrow-outer-color; border-left-color: $popover-arrow-outer-color;
&::after { }
right: 1px;
bottom: -$popover-arrow-width; &::after {
content: ""; right: -($popover-arrow-outer-width - 1);
border-right-width: 0; margin-top: -($popover-arrow-outer-width - 1);
border-left-color: $popover-arrow-color; border-left-color: $popover-arrow-color;
}
} }
} }
} }
@@ -127,21 +151,21 @@
// //
// .popover-arrow is outer, .popover-arrow::after is inner // .popover-arrow is outer, .popover-arrow::after is inner
.popover-arrow { .popover::before,
&, .popover::after {
&::after { position: absolute;
position: absolute; display: block;
display: block; width: 0;
width: 0; height: 0;
height: 0; border-color: transparent;
border-color: transparent; border-style: solid;
border-style: solid;
}
} }
.popover-arrow {
.popover::before {
content: "";
border-width: $popover-arrow-outer-width; border-width: $popover-arrow-outer-width;
} }
.popover-arrow::after { .popover::after {
content: ""; content: "";
border-width: $popover-arrow-width; border-width: $popover-arrow-width;
} }

27
scss/_tooltip.scss
View File

@@ -18,10 +18,11 @@
padding: $tooltip-arrow-width 0; padding: $tooltip-arrow-width 0;
margin-top: -$tooltip-margin; margin-top: -$tooltip-margin;
.tooltip-arrow { .tooltip-inner:before {
bottom: 0; bottom: 0;
left: 50%; left: 50%;
margin-left: -$tooltip-arrow-width; margin-left: -$tooltip-arrow-width;
content: "";
border-width: $tooltip-arrow-width $tooltip-arrow-width 0; border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
border-top-color: $tooltip-arrow-color; border-top-color: $tooltip-arrow-color;
} }
@@ -31,10 +32,11 @@
padding: 0 $tooltip-arrow-width; padding: 0 $tooltip-arrow-width;
margin-left: $tooltip-margin; margin-left: $tooltip-margin;
.tooltip-arrow { .tooltip-inner:before {
top: 50%; top: 50%;
left: 0; left: 0;
margin-top: -$tooltip-arrow-width; margin-top: -$tooltip-arrow-width;
content: "";
border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0; border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0;
border-right-color: $tooltip-arrow-color; border-right-color: $tooltip-arrow-color;
} }
@@ -44,10 +46,11 @@
padding: $tooltip-arrow-width 0; padding: $tooltip-arrow-width 0;
margin-top: $tooltip-margin; margin-top: $tooltip-margin;
.tooltip-arrow { .tooltip-inner:before {
top: 0; top: 0;
left: 50%; left: 50%;
margin-left: -$tooltip-arrow-width; margin-left: -$tooltip-arrow-width;
content: "";
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width; border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
border-bottom-color: $tooltip-arrow-color; border-bottom-color: $tooltip-arrow-color;
} }
@@ -57,10 +60,11 @@
padding: 0 $tooltip-arrow-width; padding: 0 $tooltip-arrow-width;
margin-left: -$tooltip-margin; margin-left: -$tooltip-margin;
.tooltip-arrow { .tooltip-inner:before {
top: 50%; top: 50%;
right: 0; right: 0;
margin-top: -$tooltip-arrow-width; margin-top: -$tooltip-arrow-width;
content: "";
border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width; border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width;
border-left-color: $tooltip-arrow-color; border-left-color: $tooltip-arrow-color;
} }
@@ -75,13 +79,12 @@
text-align: center; text-align: center;
background-color: $tooltip-bg; background-color: $tooltip-bg;
@include border-radius($border-radius); @include border-radius($border-radius);
}
// Arrows &:before {
.tooltip-arrow { position: absolute;
position: absolute; width: 0;
width: 0; height: 0;
height: 0; border-color: transparent;
border-color: transparent; border-style: solid;
border-style: solid; }
} }