Merge pull request #2537 from gpasztor87/patch-2

Style fix in popover.
This commit is contained in:
Samuel Georges 2016-12-03 08:12:24 +11:00 committed by GitHub
commit 7f38d9b6b3
2 changed files with 20 additions and 12 deletions

View File

@ -218,20 +218,28 @@ div.control-popover {
background-color: @color-popover-danger-bg;
}
&.placement-bottom > div:after {
.triangle(up, 15px, 8px, @color-popover-danger-bg);
&.placement-bottom {
> div:after, .popover-head:before {
.triangle(up, 15px, 8px, @color-popover-danger-bg);
}
}
&.placement-top > div:after {
.triangle(down, 15px, 8px, @color-popover-danger-bg);
&.placement-top {
> div:after, .popover-head:before {
.triangle(down, 15px, 8px, @color-popover-danger-bg);
}
}
&.placement-left > div:after {
.triangle(right, 8px, 15px, @color-popover-danger-bg);
&.placement-left {
> div:after, .popover-head:before {
.triangle(right, 8px, 15px, @color-popover-danger-bg);
}
}
&.placement-right > div:after {
.triangle(left, 8px, 15px, @color-popover-danger-bg);
&.placement-right {
> div:after, .popover-head:before {
.triangle(left, 8px, 15px, @color-popover-danger-bg);
}
}
.popover-head {

View File

@ -1416,10 +1416,10 @@ div.control-popover.placement-bottom .popover-head:before{content:'';display:blo
div.control-popover.placement-left .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-left:8px solid #f9f9f9;right:-8px;top:7px}
div.control-popover.placement-right .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-right:8px solid #f9f9f9;left:-8px;top:7px}
div.control-popover.popover-danger > div{color:#fff;background-color:#ab2a1c}
div.control-popover.popover-danger.placement-bottom > div:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #ab2a1c}
div.control-popover.popover-danger.placement-top > div:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #ab2a1c;border-bottom-width:0}
div.control-popover.popover-danger.placement-left > div:after{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-left:8px solid #ab2a1c}
div.control-popover.popover-danger.placement-right > div:after{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-right:8px solid #ab2a1c}
div.control-popover.popover-danger.placement-bottom > div:after,div.control-popover.popover-danger.placement-bottom .popover-head:before{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #ab2a1c}
div.control-popover.popover-danger.placement-top > div:after,div.control-popover.popover-danger.placement-top .popover-head:before{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #ab2a1c;border-bottom-width:0}
div.control-popover.popover-danger.placement-left > div:after,div.control-popover.popover-danger.placement-left .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-left:8px solid #ab2a1c}
div.control-popover.popover-danger.placement-right > div:after,div.control-popover.popover-danger.placement-right .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-right:8px solid #ab2a1c}
div.control-popover.popover-danger .popover-head{color:#fff;background-color:#ab2a1c;border-bottom:2px solid rgba(255,255,255,0.15)}
div.control-popover.popover-danger .popover-head .close{color:#fff;text-shadow:none}
div.control-popover div.popover-fixed-height{height:300px}