Merge pull request #437 in FUI/fineui from ~WINDY/fui:master to master

* commit '66addae37e7b88a812484adc90e1671c64471db2': BI-23867 && BI-23860
7 years ago · 11f27a17d5
16 changed files with 32 additions and 14 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.css
+++ b/dist/base.css
@ -1017,7 +1017,6 @@ body .bi-button,
  text-align: center;
  vertical-align: middle;
  cursor: pointer;
-  font-size: 14px;
 }
 body .bi-button.block,
 #body .bi-button.block {
@ -2438,6 +2437,11 @@ ul.ztree.zTreeDragUL {
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-popup-view .list-view-shadow {
+  -webkit-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  -moz-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+}
 .bi-popup-view .list-view-toolbar {
  line-height: 30px;
 }
--- a/dist/base.js
+++ b/dist/base.js
@ -15628,7 +15628,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
            hgap: o.hgap,
            items: BI.LogicFactory.createLogicItemsByDirection(o.direction,
                BI.extend({
-                    cls: "list-view-outer bi-card bi-border"
+                    cls: "list-view-outer bi-card list-view-shadow"
                }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
                    items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar)
                })))
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -3063,7 +3063,6 @@ body .bi-button,
  text-align: center;
  vertical-align: middle;
  cursor: pointer;
-  font-size: 14px;
 }
 body .bi-button.block,
 #body .bi-button.block {
@ -4484,6 +4483,11 @@ ul.ztree.zTreeDragUL {
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-popup-view .list-view-shadow {
+  -webkit-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  -moz-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+}
 .bi-popup-view .list-view-toolbar {
  line-height: 30px;
 }
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -51394,7 +51394,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
            hgap: o.hgap,
            items: BI.LogicFactory.createLogicItemsByDirection(o.direction,
                BI.extend({
-                    cls: "list-view-outer bi-card bi-border"
+                    cls: "list-view-outer bi-card list-view-shadow"
                }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
                    items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar)
                })))
--- 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
@ -3063,7 +3063,6 @@ body .bi-button,
  text-align: center;
  vertical-align: middle;
  cursor: pointer;
-  font-size: 14px;
 }
 body .bi-button.block,
 #body .bi-button.block {
@ -4484,6 +4483,11 @@ ul.ztree.zTreeDragUL {
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-popup-view .list-view-shadow {
+  -webkit-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  -moz-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+}
 .bi-popup-view .list-view-toolbar {
  line-height: 30px;
 }
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -51637,7 +51637,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
            hgap: o.hgap,
            items: BI.LogicFactory.createLogicItemsByDirection(o.direction,
                BI.extend({
-                    cls: "list-view-outer bi-card bi-border"
+                    cls: "list-view-outer bi-card list-view-shadow"
                }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
                    items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar)
                })))
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/src/base/layer/layer.popup.js
+++ b/src/base/layer/layer.popup.js
@ -83,7 +83,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
            hgap: o.hgap,
            items: BI.LogicFactory.createLogicItemsByDirection(o.direction,
                BI.extend({
-                    cls: "list-view-outer bi-card bi-border"
+                    cls: "list-view-outer bi-card list-view-shadow"
                }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
                    items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar)
                })))
--- a/src/css/base/single/button/button.css
+++ b/src/css/base/single/button/button.css
@ -8,7 +8,6 @@ body .bi-button,
  text-align: center;
  vertical-align: middle;
  cursor: pointer;
-  font-size: 14px;
 }
 body .bi-button.block,
 #body .bi-button.block {
--- a/src/css/base/view/popupview.css
+++ b/src/css/base/view/popupview.css
@ -11,6 +11,11 @@
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-popup-view .list-view-shadow {
+  -webkit-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  -moz-box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+  box-shadow: 0 1px 5px 0 rgba(255, 255, 255, 0.002);
+}
 .bi-popup-view .list-view-toolbar {
  line-height: 30px;
 }
--- a/src/less/base/single/button/button.less
+++ b/src/less/base/single/button/button.less
@ -7,7 +7,6 @@ body .bi-button, #body .bi-button {
  text-align: center;
  vertical-align: middle;
  cursor: pointer;
-  font-size: 14px;
  &.block {
    font-size: inherit;
    border-width: 0;
--- a/src/less/base/view/popupview.less
+++ b/src/less/base/view/popupview.less
@ -10,6 +10,9 @@
  & .list-view-outer {
    .border-radius(2px);
  }
+  & .list-view-shadow {
+    .box-shadow(0 1px 5px 0, fade(@color-bi-background-default, 0.2));
+  }
  & .list-view-toolbar {
    line-height: 30px;
    & > .center-element {