Browse Source

Merge pull request #453 in FUI/fineui from ~WINDY/fui:master to master

* commit 'e3cb050eeecedb3f6298bfc6473d48592b72b565':
  更新
  箭头替换,bi-background背景替换
es6
guy 7 years ago
parent
commit
cc82567293
  1. 2
      demo/css/main.css
  2. 2
      demo/js/core/layout/demo.htape.js
  3. 12
      dist/_fineui.min.js
  4. 1
      dist/base.js
  5. 28
      dist/bundle.css
  6. 5
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 6
      dist/bundle.min.js
  9. 4
      dist/case.js
  10. 2
      dist/core.css
  11. 2
      dist/core_without_normalize.css
  12. 2
      dist/demo.css
  13. 2
      dist/demo.js
  14. 28
      dist/fineui.css
  15. 5
      dist/fineui.js
  16. 2
      dist/fineui.min.css
  17. 12
      dist/fineui.min.js
  18. 22
      dist/resource.css
  19. 4
      dist/widget.css
  20. 22
      public/css/font.css
  21. 1
      src/base/single/editor/editor.js
  22. 4
      src/case/checkbox/check.arrownode.js
  23. 2
      src/css/core/utils/common.css
  24. 22
      src/css/resource/font.css
  25. 2
      src/css/widget/filemanager/nav/button/button.css
  26. 2
      src/css/widget/previewtable/previewtable.css
  27. 2
      src/less/lib/constant.less
  28. 3
      src/less/resource/font.less
  29. 22
      ui/css/font.css

2
demo/css/main.css

@ -40,7 +40,7 @@
background-color: #178cdf;
}
body {
background-color: #fafbfc;
background-color: #f7f8fa;
}
#wrapper {
position: absolute;

2
demo/js/core/layout/demo.htape.js

@ -14,7 +14,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
el: {
type: "bi.label",
text: "1",
cls: "layout-bg1"
cls: "bi-background"
}
}, {
width: 200,

12
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/base.js vendored

@ -18393,7 +18393,6 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});

28
dist/bundle.css vendored

@ -325,7 +325,7 @@ textarea {
clear: both;
}
.bi-background {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #3d4d66;
}
.bi-background .bi-input {
@ -3673,7 +3673,7 @@ ul.ztree.zTreeDragUL {
max-width: 200px;
}
.bi-file-manager-nav-button .file-manager-nav-button-text.active {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #999999;
}
.bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -3928,7 +3928,7 @@ ul.ztree.zTreeDragUL {
}
.bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd {
background-color: #fafbfc;
background-color: #f7f8fa;
}
.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
@ -4957,6 +4957,28 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e6d7";
color: inherit;
}
.expander-right-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-right-font .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-right-font.disabled .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-down-font .b-font:before {
content: "\e6d7";
color: inherit;
}
.expander-down-font.disabled .b-font:before {
content: "\e6d7";
color: inherit;
}
.solid-triangle-top-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}

5
dist/bundle.js vendored

@ -54163,7 +54163,6 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -74519,9 +74518,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
setSelected: function (v) {
BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
if(v) {
this.element.removeClass("pull-right-font").addClass("pull-down-font");
this.element.removeClass("expander-right-font").addClass("expander-down-font");
} else {
this.element.removeClass("pull-down-font").addClass("pull-right-font");
this.element.removeClass("expander-down-font").addClass("expander-right-font");
}
}
});

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/case.js vendored

@ -2049,9 +2049,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
setSelected: function (v) {
BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
if(v) {
this.element.removeClass("pull-right-font").addClass("pull-down-font");
this.element.removeClass("expander-right-font").addClass("expander-down-font");
} else {
this.element.removeClass("pull-down-font").addClass("pull-right-font");
this.element.removeClass("expander-down-font").addClass("expander-right-font");
}
}
});

2
dist/core.css vendored

@ -325,7 +325,7 @@ textarea {
clear: both;
}
.bi-background {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #3d4d66;
}
.bi-background .bi-input {

2
dist/core_without_normalize.css vendored

@ -47,7 +47,7 @@ textarea {
clear: both;
}
.bi-background {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #3d4d66;
}
.bi-background .bi-input {

2
dist/demo.css vendored

@ -43,7 +43,7 @@
background-color: #178cdf;
}
body {
background-color: #fafbfc;
background-color: #f7f8fa;
}
#wrapper {
position: absolute;

2
dist/demo.js vendored

@ -8200,7 +8200,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
el: {
type: "bi.label",
text: "1",
cls: "layout-bg1"
cls: "bi-background"
}
}, {
width: 200,

28
dist/fineui.css vendored

@ -325,7 +325,7 @@ textarea {
clear: both;
}
.bi-background {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #3d4d66;
}
.bi-background .bi-input {
@ -3673,7 +3673,7 @@ ul.ztree.zTreeDragUL {
max-width: 200px;
}
.bi-file-manager-nav-button .file-manager-nav-button-text.active {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #999999;
}
.bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -3928,7 +3928,7 @@ ul.ztree.zTreeDragUL {
}
.bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd {
background-color: #fafbfc;
background-color: #f7f8fa;
}
.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
@ -4957,6 +4957,28 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e6d7";
color: inherit;
}
.expander-right-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-right-font .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-right-font.disabled .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-down-font .b-font:before {
content: "\e6d7";
color: inherit;
}
.expander-down-font.disabled .b-font:before {
content: "\e6d7";
color: inherit;
}
.solid-triangle-top-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}

5
dist/fineui.js vendored

@ -54406,7 +54406,6 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -74762,9 +74761,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
setSelected: function (v) {
BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
if(v) {
this.element.removeClass("pull-right-font").addClass("pull-down-font");
this.element.removeClass("expander-right-font").addClass("expander-down-font");
} else {
this.element.removeClass("pull-down-font").addClass("pull-right-font");
this.element.removeClass("expander-down-font").addClass("expander-right-font");
}
}
});

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

12
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

22
dist/resource.css vendored

@ -835,6 +835,28 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e6d7";
color: inherit;
}
.expander-right-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-right-font .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-right-font.disabled .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-down-font .b-font:before {
content: "\e6d7";
color: inherit;
}
.expander-down-font.disabled .b-font:before {
content: "\e6d7";
color: inherit;
}
.solid-triangle-top-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}

4
dist/widget.css vendored

@ -28,7 +28,7 @@
max-width: 200px;
}
.bi-file-manager-nav-button .file-manager-nav-button-text.active {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #999999;
}
.bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -283,7 +283,7 @@
}
.bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd {
background-color: #fafbfc;
background-color: #f7f8fa;
}
.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {

22
public/css/font.css

@ -509,6 +509,28 @@
content: "\e6d7";
color: inherit;
}
.expander-right-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-right-font .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-right-font.disabled .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-down-font .b-font:before {
content: "\e6d7";
color: inherit;
}
.expander-down-font.disabled .b-font:before {
content: "\e6d7";
color: inherit;
}
.solid-triangle-top-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}

1
src/base/single/editor/editor.js

@ -98,7 +98,6 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});

4
src/case/checkbox/check.arrownode.js

@ -14,9 +14,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
setSelected: function (v) {
BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
if(v) {
this.element.removeClass("pull-right-font").addClass("pull-down-font");
this.element.removeClass("expander-right-font").addClass("expander-down-font");
} else {
this.element.removeClass("pull-down-font").addClass("pull-right-font");
this.element.removeClass("expander-down-font").addClass("expander-right-font");
}
}
});

2
src/css/core/utils/common.css

@ -47,7 +47,7 @@ textarea {
clear: both;
}
.bi-background {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #3d4d66;
}
.bi-background .bi-input {

22
src/css/resource/font.css

@ -509,6 +509,28 @@
content: "\e6d7";
color: inherit;
}
.expander-right-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-right-font .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-right-font.disabled .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-down-font .b-font:before {
content: "\e6d7";
color: inherit;
}
.expander-down-font.disabled .b-font:before {
content: "\e6d7";
color: inherit;
}
.solid-triangle-top-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}

2
src/css/widget/filemanager/nav/button/button.css

@ -2,7 +2,7 @@
max-width: 200px;
}
.bi-file-manager-nav-button .file-manager-nav-button-text.active {
background-color: #fafbfc;
background-color: #f7f8fa;
color: #999999;
}
.bi-file-manager-nav-button .file-manager-nav-button-triangle {

2
src/css/widget/previewtable/previewtable.css

@ -19,7 +19,7 @@
}
.bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd {
background-color: #fafbfc;
background-color: #f7f8fa;
}
.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {

2
src/less/lib/constant.less

@ -33,7 +33,7 @@
@background-color-black: #1a1a1a;//
@background-color-default: #ffffff;//
@background-color-default-theme-dark: #242640;//
@background-color-normal: #fafbfc;//
@background-color-normal: #f7f8fa;//
@background-color-normal-theme-dark: #191B2B;//
@background-color-light-highlight: #eaf2fd;
@background-color-highlight: #3685f2;

3
src/less/resource/font.less

@ -67,6 +67,9 @@
.font-hover(column-pre-page-h-font, @font-solid-top);
.font-hover(column-next-page-h-font, @font-solid-bottom);
.font(expander-right-font, @font-solid-right);
.font(expander-down-font, @font-solid-bottom);
// 实心下拉三角
.font-hover(solid-triangle-top-font, @font-solid-top);
.font-hover(solid-triangle-bottom-font, @font-solid-bottom);

22
ui/css/font.css

@ -509,6 +509,28 @@
content: "\e6d7";
color: inherit;
}
.expander-right-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-right-font .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-right-font.disabled .b-font:before {
content: "\e6d8";
color: inherit;
}
.expander-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.expander-down-font .b-font:before {
content: "\e6d7";
color: inherit;
}
.expander-down-font.disabled .b-font:before {
content: "\e6d7";
color: inherit;
}
.solid-triangle-top-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}

Loading…
Cancel
Save