Browse Source

Merge pull request #268 in ~GUY/fineui from ~YOUNG/fineuig:master to master

* commit '7cdb3b703f2404c1e689298c57f5fd321f760608':
  展开收起按钮替换&bi-background颜色修改
es6
Young 7 years ago
parent
commit
46bb2cfced
  1. 13987
      bi/case.js
  2. 2
      bi/core.css
  3. 4
      bi/widget.css
  4. 2
      demo/css/main.css
  5. 6
      dist/bundle.css
  6. 4
      dist/bundle.js
  7. 4
      dist/case.js
  8. 2
      dist/core.css
  9. 2
      dist/core_without_normalize.css
  10. 2
      dist/demo.css
  11. 8
      dist/resource.css
  12. 4
      dist/widget.css
  13. 4
      src/case/checkbox/check.arrowtreegroupnode.js
  14. 2
      src/css/core/utils/common.css
  15. 8
      src/css/resource/font.css
  16. 2
      src/css/widget/filemanager/nav/button/button.nav.filemanager.css
  17. 2
      src/css/widget/previewtable/previewtable.css
  18. 2
      src/less/lib/constant.less
  19. 2
      src/less/lib/font.less

13987
bi/case.js

File diff suppressed because it is too large Load Diff

2
bi/core.css

@ -322,7 +322,7 @@ i {
clear: both; clear: both;
} }
.bi-background { .bi-background {
background-color: #eff1f4; background-color: #fafbfc;
color: #3d4d66; color: #3d4d66;
} }
.bi-background .bi-input { .bi-background .bi-input {

4
bi/widget.css

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

2
demo/css/main.css

@ -40,7 +40,7 @@
background-color: #178cdf; background-color: #178cdf;
} }
body { body {
background-color: #eff1f4; background-color: #fafbfc;
} }
.bi-theme-dark body { .bi-theme-dark body {
background-color: #191B2B; background-color: #191B2B;

6
dist/bundle.css vendored

@ -322,7 +322,7 @@ i {
clear: both; clear: both;
} }
.bi-background { .bi-background {
background-color: #eff1f4; background-color: #fafbfc;
color: #3d4d66; color: #3d4d66;
} }
.bi-background .bi-input { .bi-background .bi-input {
@ -3267,7 +3267,7 @@ ul.ztree.zTreeDragUL {
max-width: 200px; max-width: 200px;
} }
.bi-file-manager-nav-button .file-manager-nav-button-text.active { .bi-file-manager-nav-button .file-manager-nav-button-text.active {
background-color: #eff1f4; background-color: #fafbfc;
color: #999999; color: #999999;
} }
.bi-file-manager-nav-button .file-manager-nav-button-triangle { .bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -3427,7 +3427,7 @@ ul.ztree.zTreeDragUL {
} }
.bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd { .bi-preview-table > div > div > div > table > thead > tr.odd {
background-color: #eff1f4; background-color: #fafbfc;
} }
.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd { .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {

4
dist/bundle.js vendored

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

4
dist/case.js vendored

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

2
dist/core.css vendored

@ -322,7 +322,7 @@ i {
clear: both; clear: both;
} }
.bi-background { .bi-background {
background-color: #eff1f4; background-color: #fafbfc;
color: #3d4d66; color: #3d4d66;
} }
.bi-background .bi-input { .bi-background .bi-input {

2
dist/core_without_normalize.css vendored

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

2
dist/demo.css vendored

@ -43,7 +43,7 @@
background-color: #178cdf; background-color: #178cdf;
} }
body { body {
background-color: #eff1f4; background-color: #fafbfc;
} }
.bi-theme-dark body { .bi-theme-dark body {
background-color: #191B2B; background-color: #191B2B;

8
dist/resource.css vendored

@ -951,19 +951,19 @@ textarea::-webkit-scrollbar-thumb:hover {
color: #ffffff; color: #ffffff;
} }
.primary-key-font .b-font { .primary-key-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';'); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }
.primary-key-font .b-font:before { .primary-key-font .b-font:before {
content: "\e67d;"; content: "\e67d";
color: inherit; color: inherit;
} }
.primary-key-font:hover .b-font:before, .primary-key-font:hover .b-font:before,
.primary-key-font.hover .b-font:before { .primary-key-font.hover .b-font:before {
content: "\e67d;"; content: "\e67d";
color: inherit; color: inherit;
} }
.primary-key-font.disabled .b-font:before { .primary-key-font.disabled .b-font:before {
content: "\e67d;"; content: "\e67d";
color: inherit; color: inherit;
} }
.drag-tag-font .b-font { .drag-tag-font .b-font {

4
dist/widget.css vendored

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

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

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

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

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

8
src/css/resource/font.css

@ -622,19 +622,19 @@
color: #ffffff; color: #ffffff;
} }
.primary-key-font .b-font { .primary-key-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';'); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }
.primary-key-font .b-font:before { .primary-key-font .b-font:before {
content: "\e67d;"; content: "\e67d";
color: inherit; color: inherit;
} }
.primary-key-font:hover .b-font:before, .primary-key-font:hover .b-font:before,
.primary-key-font.hover .b-font:before { .primary-key-font.hover .b-font:before {
content: "\e67d;"; content: "\e67d";
color: inherit; color: inherit;
} }
.primary-key-font.disabled .b-font:before { .primary-key-font.disabled .b-font:before {
content: "\e67d;"; content: "\e67d";
color: inherit; color: inherit;
} }
.drag-tag-font .b-font { .drag-tag-font .b-font {

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

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

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

@ -8,7 +8,7 @@
} }
.bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd { .bi-preview-table > div > div > div > table > thead > tr.odd {
background-color: #eff1f4; background-color: #fafbfc;
} }
.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
.bi-theme-dark .bi-preview-table > div > div > 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-black: #1a1a1a;//
@background-color-default: #ffffff;// @background-color-default: #ffffff;//
@background-color-default-theme-dark: #242640;// @background-color-default-theme-dark: #242640;//
@background-color-normal: #eff1f4;// @background-color-normal: #fafbfc;//
@background-color-normal-theme-dark: #191B2B;// @background-color-normal-theme-dark: #191B2B;//
@background-color-highlight: #3f8ce8; @background-color-highlight: #3f8ce8;
@background-color-dark: #d4dadd; @background-color-dark: #d4dadd;

2
src/less/lib/font.less

@ -116,7 +116,7 @@
@font-excel-table: "e682"; @font-excel-table: "e682";
@font-etl-table: "e680"; @font-etl-table: "e680";
@font-sql-table: "e681"; @font-sql-table: "e681";
@font-key: "e67d;"; @font-key: "e67d";
@font-refresh: "e683"; @font-refresh: "e683";
@font-tile-view: "e685"; @font-tile-view: "e685";

Loading…
Cancel
Save