Browse Source

Pull request #2470: 无JIRA任务 chore优化一下

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '1ac976aab424c8b9461750455aa7bf22c755a84c':
  update
es6
guy 3 years ago
parent
commit
67d4854907
  1. 61
      src/less/base/combo/combo.bubble.less
  2. 10
      src/less/base/view/popupview.less

61
src/less/base/combo/combo.bubble.less

@ -1,57 +1,12 @@
@import "../../index"; @import "../../index";
.bi-bubble-combo { // .bi-bubble-combo {
& .button-combo-triangle-wrapper { // & .button-combo-triangle-wrapper {
position: fixed !important; // position: fixed !important;
// 消除祖先节点设置的line-height:normal对空白节点的行高影响 // // 消除祖先节点设置的line-height:normal对空白节点的行高影响
line-height: 0; // line-height: 0;
.z-index-layer(@zIndex-popup); // .z-index-layer(@zIndex-popup);
// ie10一下无背景色会鼠标穿透 // // ie10一下无背景色会鼠标穿透
.background-color(@color-bi-background-default, 0); // .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-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;
}
}
}
}

10
src/less/base/view/popupview.less

@ -30,32 +30,40 @@
.bi-popup-view[data-popper-placement^='top'], .bi-popup-view.top { .bi-popup-view[data-popper-placement^='top'], .bi-popup-view.top {
> .bi-bubble-arrow { > .bi-bubble-arrow {
bottom: -12px; bottom: -12px;
width: 14px;
> .bubble-arrow { > .bubble-arrow {
bottom: 8px; bottom: 8px;
left: 1px;
} }
} }
} }
.bi-popup-view[data-popper-placement^='bottom'], .bi-popup-view.bottom { .bi-popup-view[data-popper-placement^='bottom'], .bi-popup-view.bottom {
> .bi-bubble-arrow { > .bi-bubble-arrow {
top: -12px; top: -12px;
width: 14px;
> .bubble-arrow { > .bubble-arrow {
top: 8px; top: 8px;
left: 1px;
} }
} }
} }
.bi-popup-view[data-popper-placement^='left'], .bi-popup-view.left { .bi-popup-view[data-popper-placement^='left'], .bi-popup-view.left {
> .bi-bubble-arrow { > .bi-bubble-arrow {
right: -12px; right: -12px;
height: 14px;
> .bubble-arrow { > .bubble-arrow {
right: 8px; right: 8px;
top: 1px;
} }
} }
} }
.bi-popup-view[data-popper-placement^='right'], .bi-popup-view.right { .bi-popup-view[data-popper-placement^='right'], .bi-popup-view.right {
> .bi-bubble-arrow { > .bi-bubble-arrow {
left: -12px; left: -12px;
height: 14px;
> .bubble-arrow { > .bubble-arrow {
left: 8px; left: 8px;
top: 1px;
} }
} }
} }
@ -63,6 +71,8 @@
.bi-bubble-arrow { .bi-bubble-arrow {
width: 12px; width: 12px;
height: 12px; height: 12px;
// 消除祖先节点设置的line-height:normal对空白节点的行高影响
line-height: 0;
overflow: hidden; overflow: hidden;
.bubble-arrow { .bubble-arrow {
width: 12px; width: 12px;

Loading…
Cancel
Save