Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
guy 6 years ago
parent
commit
9ee9206fbf
  1. 3
      dist/base.css
  2. 3
      dist/bundle.css
  3. 5
      dist/bundle.js
  4. 24
      dist/bundle.min.js
  5. 5
      dist/case.js
  6. 3
      dist/fineui.css
  7. 5
      dist/fineui.js
  8. 24
      dist/fineui.min.js
  9. 5
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 2
      src/case/layer/panel.js
  12. 3
      src/css/base/layer/panel.css
  13. 1
      src/less/base/layer/panel.less

3
dist/base.css vendored

@ -622,9 +622,6 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

3
dist/bundle.css vendored

@ -2576,9 +2576,6 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

5
dist/bundle.js vendored

@ -55890,7 +55890,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -55909,7 +55909,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

24
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/case.js vendored

@ -7158,7 +7158,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -7177,7 +7177,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

3
dist/fineui.css vendored

@ -2576,9 +2576,6 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

5
dist/fineui.js vendored

@ -56132,7 +56132,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -56151,7 +56151,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

24
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored

@ -39066,7 +39066,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],
@ -39085,7 +39085,8 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
BI.shortcut("bi.panel", BI.Panel);
BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
props: {
extraCls: "bi-line-segment-button bi-list-item-effect",

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
src/case/layer/panel.js

@ -57,7 +57,7 @@ BI.Panel = BI.inherit(BI.Widget, {
return {
el: {
type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-border-bottom",
cls: "panel-title bi-header-background bi-border-bottom",
height: 29,
items: {
left: [this.text],

3
src/css/base/layer/panel.css

@ -3,9 +3,6 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;
font-size: 14px;

1
src/less/base/layer/panel.less

@ -3,7 +3,6 @@
.bi-panel{
.border-radius(2px);
.panel-title{
background-color: @color-bi-background-light-gray;
& .panel-title-text{
cursor: text;
font-size: @font-size-14;

Loading…
Cancel
Save