Browse Source

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

* commit '66addae37e7b88a812484adc90e1671c64471db2':
  BI-23867 && BI-23860
es6
guy 6 years ago
parent
commit
11f27a17d5
  1. 2
      dist/_fineui.min.js
  2. 6
      dist/base.css
  3. 2
      dist/base.js
  4. 6
      dist/bundle.css
  5. 2
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 2
      dist/bundle.min.js
  8. 6
      dist/fineui.css
  9. 2
      dist/fineui.js
  10. 2
      dist/fineui.min.css
  11. 2
      dist/fineui.min.js
  12. 2
      src/base/layer/layer.popup.js
  13. 1
      src/css/base/single/button/button.css
  14. 5
      src/css/base/view/popupview.css
  15. 1
      src/less/base/single/button/button.less
  16. 3
      src/less/base/view/popupview.less

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/base.css vendored

@ -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;
}

2
dist/base.js vendored

@ -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)
})))

6
dist/bundle.css vendored

@ -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;
}

2
dist/bundle.js vendored

@ -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)
})))

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.css vendored

@ -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;
}

2
dist/fineui.js vendored

@ -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)
})))

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
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)
})))

1
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 {

5
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;
}

1
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;

3
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 {

Loading…
Cancel
Save