Browse Source

Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui

# Conflicts:
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.min.css
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.min.js
#	dist/bundle.min.css
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.css
#	dist/fineui.min.js
#	dist/utils.min.js
es6
windy 6 years ago
parent
commit
706c71aaa1
  1. 2
      dist/2.0/fineui.ie.js
  2. 2
      dist/2.0/fineui.js
  3. 2
      dist/bundle.ie.js
  4. 2
      dist/bundle.js
  5. 2
      dist/core.js
  6. 2
      dist/fineui.ie.js
  7. 2
      dist/fineui.js
  8. 2
      dist/fineui_without_jquery_polyfill.js
  9. 2
      src/core/wrapper/layout/flex/flex.horizontal.center.js

2
dist/2.0/fineui.ie.js vendored

@ -31379,7 +31379,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/2.0/fineui.js vendored

@ -31379,7 +31379,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/bundle.ie.js vendored

@ -31379,7 +31379,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/bundle.js vendored

@ -31379,7 +31379,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/core.js vendored

@ -31379,7 +31379,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/fineui.ie.js vendored

@ -31624,7 +31624,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/fineui.js vendored

@ -31624,7 +31624,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

2
dist/fineui_without_jquery_polyfill.js vendored

@ -20305,7 +20305,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);/**
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*

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

@ -51,4 +51,4 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);
Loading…
Cancel
Save