fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
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
1d32c712da d9844237de
commit
9ee9206fbf
13 changed files with 40 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 4
      src/case/layer/panel.js
  12. 3
      src/css/base/layer/panel.css
  13. 3
      src/less/base/layer/panel.less

3
dist/base.css vendored
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
View File

File diff suppressed because one or more lines are too long

5
dist/case.js vendored
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
View File

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -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
View File

File diff suppressed because one or more lines are too long

4
src/case/layer/panel.js
Unescape View File

@ -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],
@ -76,4 +76,4 @@ BI.Panel = BI.inherit(BI.Widget, {
});
BI.Panel.EVENT_CHANGE = "Panel.EVENT_CHANGE";
BI.shortcut("bi.panel", BI.Panel);
BI.shortcut("bi.panel", BI.Panel);

3
src/css/base/layer/panel.css
Unescape View File

@ -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;

3
src/less/base/layer/panel.less
Unescape View File

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

Write Preview
Loading…
Cancel
Save