Browse Source

Merge pull request #819 in VISUAL/fineui from ~IMP/fineui_fui:master to master

* commit '38e8cb0d72c6bf213915a1f79a5a0fef571d6927':
  BI-38683 模板背景透明
master
guy 6 years ago
parent
commit
5c3f53b025
  1. 1
      dist/bundle.css
  2. 2
      dist/bundle.ie.min.js
  3. 2
      dist/bundle.min.css
  4. 2
      dist/bundle.min.js
  5. 1
      dist/core.css
  6. 1
      dist/core_without_normalize.css
  7. 25
      dist/demo.js
  8. 1
      dist/fineui.css
  9. 2
      dist/fineui.ie.min.js
  10. 2
      dist/fineui.min.css
  11. 2
      dist/fineui.min.js
  12. 2
      dist/utils.min.js
  13. 1
      src/css/theme/dark.css
  14. 1
      src/less/theme/dark.less

1
dist/bundle.css vendored

@ -1964,7 +1964,6 @@ textarea {
display: inline-block !important; display: inline-block !important;
} }
.bi-theme-dark { .bi-theme-dark {
background-color: #191B2B;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {

2
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

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

1
dist/core.css vendored

@ -1964,7 +1964,6 @@ textarea {
display: inline-block !important; display: inline-block !important;
} }
.bi-theme-dark { .bi-theme-dark {
background-color: #191B2B;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {

1
dist/core_without_normalize.css vendored

@ -1683,7 +1683,6 @@ textarea {
display: inline-block !important; display: inline-block !important;
} }
.bi-theme-dark { .bi-theme-dark {
background-color: #191B2B;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {

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

1
dist/fineui.css vendored

@ -1964,7 +1964,6 @@ textarea {
display: inline-block !important; display: inline-block !important;
} }
.bi-theme-dark { .bi-theme-dark {
background-color: #191B2B;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {

2
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
src/css/theme/dark.css

@ -1,5 +1,4 @@
.bi-theme-dark { .bi-theme-dark {
background-color: #191B2B;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {

1
src/less/theme/dark.less

@ -1,7 +1,6 @@
@import "../index"; @import "../index";
.bi-theme-dark { .bi-theme-dark {
background-color: @color-bi-background-normal-theme-dark;
color: @color-bi-text-theme-dark; color: @color-bi-text-theme-dark;
& .bi-input { & .bi-input {
color: @color-bi-text; color: @color-bi-text;

Loading…
Cancel
Save