Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-11-28 13:38:21 +0400
committerMark Otto <otto@github.com>2012-11-28 13:38:21 +0400
commitbfc97fdaf6cefceb4091e745977b5bac2ffda1c7 (patch)
tree3cde5df10dc96733ac2fe7a327d267ec3d4fbfb6
parentfda5bb135e0a91f335f1e3bd4e5313070f6e0708 (diff)
Fixes #4852: IE8 popover carets fixed
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles. * .arrow is the gray border/background, .arrow:after is now the white inner arrow * Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported * Simplified some of the CSS for the popover carets
-rw-r--r--docs/assets/css/bootstrap.css136
-rw-r--r--less/popovers.less82
2 files changed, 178 insertions, 40 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ed58d7aafa..9eee6fa0ca 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5316,76 +5316,144 @@ input[type="submit"].btn.btn-mini {
.popover .arrow,
.popover .arrow:after {
position: absolute;
- display: inline-block;
+ display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
+.popover .arrow {
+ border-width: 11px;
+}
+
.popover .arrow:after {
- z-index: -1;
+ border-width: 10px;
content: "";
}
+.popover {
+ /*
+ &.top .arrow {
+ bottom: -@popoverArrowWidth;
+ left: 50%;
+ margin-left: -@popoverArrowWidth;
+ border-width: @popoverArrowWidth @popoverArrowWidth 0;
+ //border-top-color: @popoverArrowColor;
+ border-top-color: blue;
+ &:after {
+ border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0;
+ //border-top-color: @popoverArrowOuterColor;
+ border-top-color: red;
+ top: -@popoverArrowWidth;
+ //bottom: -1px;
+ left: -@popoverArrowOuterWidth;
+ }
+ }
+ &.right .arrow {
+ top: 50%;
+ left: -@popoverArrowWidth;
+ margin-top: -@popoverArrowWidth;
+ border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0;
+ border-right-color: @popoverArrowColor;
+ &:after {
+ border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0;
+ border-right-color: @popoverArrowOuterColor;
+ bottom: -@popoverArrowOuterWidth;
+ left: -1px;
+ }
+ }
+ &.bottom .arrow {
+ top: -@popoverArrowWidth;
+ left: 50%;
+ margin-left: -@popoverArrowWidth;
+ border-width: 0 @popoverArrowWidth @popoverArrowWidth;
+ border-bottom-color: @popoverArrowColor;
+ &:after {
+ border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth;
+ border-bottom-color: @popoverArrowOuterColor;
+ top: -1px;
+ left: -@popoverArrowOuterWidth;
+ }
+ }
+ &.left .arrow {
+ top: 50%;
+ right: -@popoverArrowWidth;
+ margin-top: -@popoverArrowWidth;
+ border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth;
+ border-left-color: @popoverArrowColor;
+ &:after {
+ border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth;
+ border-left-color: @popoverArrowOuterColor;
+ bottom: -@popoverArrowOuterWidth;
+ right: -1px;
+ }
+ }*/
+
+}
+
.popover.top .arrow {
- bottom: -10px;
+ bottom: -11px;
left: 50%;
- margin-left: -10px;
- border-top-color: #ffffff;
- border-width: 10px 10px 0;
+ margin-left: -11px;
+ border-top-color: #999;
+ border-top-color: rgba(0, 0, 0, 0.25);
+ border-bottom-width: 0;
}
.popover.top .arrow:after {
- bottom: -1px;
- left: -11px;
- border-top-color: rgba(0, 0, 0, 0.25);
- border-width: 11px 11px 0;
+ bottom: 1px;
+ margin-left: -10px;
+ border-top-color: #ffffff;
+ border-bottom-width: 0;
}
.popover.right .arrow {
top: 50%;
- left: -10px;
- margin-top: -10px;
- border-right-color: #ffffff;
- border-width: 10px 10px 10px 0;
+ left: -11px;
+ margin-top: -11px;
+ border-right-color: #999;
+ border-right-color: rgba(0, 0, 0, 0.25);
+ border-left-width: 0;
}
.popover.right .arrow:after {
- bottom: -11px;
- left: -1px;
- border-right-color: rgba(0, 0, 0, 0.25);
- border-width: 11px 11px 11px 0;
+ bottom: -10px;
+ left: 1px;
+ border-right-color: #ffffff;
+ border-left-width: 0;
}
.popover.bottom .arrow {
- top: -10px;
+ top: -11px;
left: 50%;
- margin-left: -10px;
- border-bottom-color: #ffffff;
- border-width: 0 10px 10px;
+ margin-left: -11px;
+ border-bottom-color: #999;
+ border-bottom-color: rgba(0, 0, 0, 0.25);
+ border-top-width: 0;
}
.popover.bottom .arrow:after {
- top: -1px;
- left: -11px;
- border-bottom-color: rgba(0, 0, 0, 0.25);
- border-width: 0 11px 11px;
+ top: 1px;
+ margin-left: -10px;
+ border-bottom-color: #ffffff;
+ border-top-width: 0;
}
.popover.left .arrow {
top: 50%;
- right: -10px;
- margin-top: -10px;
- border-left-color: #ffffff;
- border-width: 10px 0 10px 10px;
+ right: -11px;
+ margin-top: -11px;
+ border-left-color: #999;
+ border-left-color: rgba(0, 0, 0, 0.25);
+ border-right-width: 0;
}
.popover.left .arrow:after {
- right: -1px;
- bottom: -11px;
- border-left-color: rgba(0, 0, 0, 0.25);
- border-width: 11px 0 11px 11px;
+ right: 1px;
+ bottom: -10px;
+ border-left-color: #ffffff;
+ border-right-width: 0;
}
.thumbnails {
diff --git a/less/popovers.less b/less/popovers.less
index 4a36db4e8d..9619e2d8d9 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -49,31 +49,101 @@
}
// Arrows
+//
+// .arrow is outer, .arrow:after is inner
+
.popover .arrow,
.popover .arrow:after {
position: absolute;
- display: inline-block;
+ display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
+.popover .arrow {
+ border-width: @popoverArrowOuterWidth;
+}
.popover .arrow:after {
+ border-width: @popoverArrowWidth;
content: "";
- z-index: -1;
}
.popover {
&.top .arrow {
+ left: 50%;
+ margin-left: -@popoverArrowOuterWidth;
+ border-bottom-width: 0;
+ border-top-color: #999; // IE8 fallback
+ border-top-color: @popoverArrowOuterColor;
+ bottom: -@popoverArrowOuterWidth;
+ &:after {
+ bottom: 1px;
+ margin-left: -@popoverArrowWidth;
+ border-bottom-width: 0;
+ border-top-color: @popoverArrowColor;
+ }
+ }
+ &.right .arrow {
+ top: 50%;
+ left: -@popoverArrowOuterWidth;
+ margin-top: -@popoverArrowOuterWidth;
+ border-left-width: 0;
+ border-right-color: #999; // IE8 fallback
+ border-right-color: @popoverArrowOuterColor;
+ &:after {
+ left: 1px;
+ bottom: -@popoverArrowWidth;
+ border-left-width: 0;
+ border-right-color: @popoverArrowColor;
+ }
+ }
+ &.bottom .arrow {
+ left: 50%;
+ margin-left: -@popoverArrowOuterWidth;
+ border-top-width: 0;
+ border-bottom-color: #999; // IE8 fallback
+ border-bottom-color: @popoverArrowOuterColor;
+ top: -@popoverArrowOuterWidth;
+ &:after {
+ top: 1px;
+ margin-left: -@popoverArrowWidth;
+ border-top-width: 0;
+ border-bottom-color: @popoverArrowColor;
+ }
+ }
+
+ &.left .arrow {
+ top: 50%;
+ right: -@popoverArrowOuterWidth;
+ margin-top: -@popoverArrowOuterWidth;
+ border-right-width: 0;
+ border-left-color: #999; // IE8 fallback
+ border-left-color: @popoverArrowOuterColor;
+ &:after {
+ right: 1px;
+ border-right-width: 0;
+ border-left-color: @popoverArrowColor;
+ bottom: -@popoverArrowWidth;
+ }
+ }
+
+
+
+/*
+ &.top .arrow {
bottom: -@popoverArrowWidth;
left: 50%;
margin-left: -@popoverArrowWidth;
border-width: @popoverArrowWidth @popoverArrowWidth 0;
- border-top-color: @popoverArrowColor;
+ //border-top-color: @popoverArrowColor;
+ border-top-color: blue;
&:after {
border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0;
- border-top-color: @popoverArrowOuterColor;
- bottom: -1px;
+ //border-top-color: @popoverArrowOuterColor;
+ border-top-color: red;
+ top: -@popoverArrowWidth;
+ //bottom: -1px;
left: -@popoverArrowOuterWidth;
}
}
@@ -115,5 +185,5 @@
bottom: -@popoverArrowOuterWidth;
right: -1px;
}
- }
+ }*/
}