Browse Source

Merge pull request #827 in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '9a6dbf2d01b315691a05a23f70701638395f8ad0':
  build
  update
  无jira任务,加个定义背景图的方法.
es6
Dailer 6 years ago
parent
commit
40c9353a0a
  1. 2
      dist/bundle.ie.min.js
  2. 2
      dist/bundle.min.js
  3. 25
      dist/demo.js
  4. 2
      dist/fineui.ie.min.js
  5. 2
      dist/fineui.min.js
  6. 2
      dist/utils.min.js
  7. 10
      src/less/image.less

2
dist/bundle.ie.min.js 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

25
dist/demo.js vendored

@ -6158,30 +6158,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, { BI.shortcut("demo.htape", Demo.HtapeLayout);/**
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

2
dist/fineui.ie.min.js 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
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

10
src/less/image.less

@ -18,6 +18,16 @@
_background: none; _background: none;
} }
.background(@class, @backgroundPath, @top:center, @left:center, @repeat: no-repeat) {
.@{class} {
.image2xPath(@backgroundPath, @top, @left, @repeat);
&.hack {
.imagePath(@backgroundPath, @top, @left, @repeat);
}
}
}
// 默认icon // 默认icon
.icon(@class, @iconPath) { .icon(@class, @iconPath) {
.@{class} { .@{class} {

Loading…
Cancel
Save