diff --git a/src/less/base/combo/combo.bubble.less b/src/less/base/combo/combo.bubble.less index e5a59b0cb..a6f21add1 100644 --- a/src/less/base/combo/combo.bubble.less +++ b/src/less/base/combo/combo.bubble.less @@ -1,57 +1,12 @@ @import "../../index"; -.bi-bubble-combo { - & .button-combo-triangle-wrapper { - position: fixed !important; - // 消除祖先节点设置的line-height:normal对空白节点的行高影响 - line-height: 0; - .z-index-layer(@zIndex-popup); - // ie10一下无背景色会鼠标穿透 - .background-color(@color-bi-background-default, 0); - } - & .bubble-combo-triangle-left { - z-index: 1; - .triangle-right(); - } - & .bubble-combo-triangle-right { - z-index: 1; - .triangle-left(); - } - & .bubble-combo-triangle-top { - z-index: 1; - .triangle-bottom(); - } - & .bubble-combo-triangle-bottom { - z-index: 1; - .triangle-top(); - } - & .bubble-combo-triangle-left, & .bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom { - &:before { - background-color: @color-bi-background-bubble-combo-triangle; - } - &.bi-primary:before { - background-color: @background-color-card-primary; - } - } -} - -// .bi-combo-popup .bi-bubble-popup-view { -// &.bi-zoom-big-leave{ -// .zoom-big-motion-enter(); -// } -// &.bi-zoom-big-leave-active{ -// .zoom-big-motion-enter-active(); +// .bi-bubble-combo { +// & .button-combo-triangle-wrapper { +// position: fixed !important; +// // 消除祖先节点设置的line-height:normal对空白节点的行高影响 +// line-height: 0; +// .z-index-layer(@zIndex-popup); +// // ie10一下无背景色会鼠标穿透 +// .background-color(@color-bi-background-default, 0); // } // } - -.bi-theme-dark { - .bi-bubble-combo { - & .bubble-combo-triangle-left, & .bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom { - &:before { - background-color: @color-bi-background-bubble-combo-triangle-theme-dark; - border-bottom: 1px solid @color-bi-border-bubble-combo-triangle-theme-dark; - border-right: 1px solid @color-bi-border-bubble-combo-triangle-theme-dark; - } - } - } -} diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index cc8387fb7..d145e0d3c 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -30,32 +30,40 @@ .bi-popup-view[data-popper-placement^='top'], .bi-popup-view.top { > .bi-bubble-arrow { bottom: -12px; + width: 14px; > .bubble-arrow { bottom: 8px; + left: 1px; } } } .bi-popup-view[data-popper-placement^='bottom'], .bi-popup-view.bottom { > .bi-bubble-arrow { top: -12px; + width: 14px; > .bubble-arrow { top: 8px; + left: 1px; } } } .bi-popup-view[data-popper-placement^='left'], .bi-popup-view.left { > .bi-bubble-arrow { right: -12px; + height: 14px; > .bubble-arrow { right: 8px; + top: 1px; } } } .bi-popup-view[data-popper-placement^='right'], .bi-popup-view.right { > .bi-bubble-arrow { left: -12px; + height: 14px; > .bubble-arrow { left: 8px; + top: 1px; } } } @@ -63,6 +71,8 @@ .bi-bubble-arrow { width: 12px; height: 12px; + // 消除祖先节点设置的line-height:normal对空白节点的行高影响 + line-height: 0; overflow: hidden; .bubble-arrow { width: 12px;