Browse Source

Pull request #1854: 优化布局

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

* commit 'c0c4f25a37d9ce6ee9c74f4e62f0fea7b78d243c':
  优化布局
es6
guy 4 years ago
parent
commit
7acecffe70
  1. 2
      src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
  2. 4
      src/less/core/wrapper/flex.wrapper.horizontal.less
  3. 8
      src/less/core/wrapper/flex.wrapper.vertical.less

2
src/core/wrapper/layout/flex/flex.leftrightvertical.center.js

@ -57,7 +57,7 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
rightItems = BI.map(rightItems, function (i, item) { rightItems = BI.map(rightItems, function (i, item) {
if (i === 0) { if (i === 0) {
if (BI.isWidget(item)) { if (BI.isWidget(item)) {
item.addClass("flex-left-auto"); item.element.addClass("flex-left-auto");
} else { } else {
var t = BI.stripEL(item); var t = BI.stripEL(item);
t.cls = (t.cls || "") + " flex-left-auto"; t.cls = (t.cls || "") + " flex-left-auto";

4
src/less/core/wrapper/flex.wrapper.horizontal.less

@ -149,6 +149,10 @@
align-items: stretch; align-items: stretch;
} }
&.h-stretch {
min-width: 100%;
}
&.h-center { &.h-center {
///* 09版 */ ///* 09版 */
//-webkit-box-pack: center; //-webkit-box-pack: center;

8
src/less/core/wrapper/flex.wrapper.vertical.less

@ -132,10 +132,6 @@
margin-left: auto !important; margin-left: auto !important;
margin-right: auto !important; margin-right: auto !important;
} }
&.v-middle {
min-height: 100%;
}
} }
&.h-right { &.h-right {
@ -162,6 +158,10 @@
align-items: stretch; align-items: stretch;
} }
&.v-stretch {
min-height: 100%;
}
&.v-middle { &.v-middle {
///* 09版 */ ///* 09版 */
//-webkit-box-pack: center; //-webkit-box-pack: center;

Loading…
Cancel
Save