BI-24459

7 years ago · e3c6c93637
10 changed files with 53 additions and 51 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.css
+++ b/dist/base.css
@ -1896,10 +1896,10 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -3593,10 +3593,10 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -3593,10 +3593,10 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/src/css/base/trigger/trigger.css
+++ b/src/css/base/trigger/trigger.css
@ -9,10 +9,10 @@
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/src/less/base/trigger/trigger.less
+++ b/src/less/base/trigger/trigger.less
@ -13,10 +13,12 @@
 }

 .bi-combo-popup {
-  & .trigger-up {
-    display: block;
-  }
-  & .trigger-down {
-    display: none;
+  & > .bi-trigger {
+    .trigger-up {
+      display: block;
+    }
+    .trigger-down {
+      display: none;
+    }
  }
 }