Browse Source

Pull request #2432: 无JIRA任务 线差0.5px换一组图标

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '8fc91a2675d5e06210f4ba03569b9abd465a0da9':
  边框标红补充
  常量
  无JIRA任务 线差0.5px换一组图标
es6
windy 3 years ago
parent
commit
bb65fa2e39
  1. BIN
      dist/images/1x/icon/dark/tree_solid_collapse_2.png
  2. BIN
      dist/images/1x/icon/dark/tree_solid_collapse_3.png
  3. BIN
      dist/images/1x/icon/dark/tree_solid_collapse_4.png
  4. BIN
      dist/images/1x/icon/dark/tree_solid_collapse_5.png
  5. BIN
      dist/images/1x/icon/dark/tree_solid_expand_2.png
  6. BIN
      dist/images/1x/icon/dark/tree_solid_expand_3.png
  7. BIN
      dist/images/1x/icon/dark/tree_solid_expand_4.png
  8. BIN
      dist/images/1x/icon/dark/tree_solid_expand_5.png
  9. BIN
      dist/images/1x/icon/dark/tree_solid_vertical_line_1.png
  10. BIN
      dist/images/1x/icon/dark/tree_solid_vertical_line_2.png
  11. BIN
      dist/images/1x/icon/dark/tree_solid_vertical_line_3.png
  12. BIN
      dist/images/1x/icon/dark/tree_solid_vertical_line_4.png
  13. BIN
      dist/images/1x/icon/tree_solid_collapse_1.png
  14. BIN
      dist/images/1x/icon/tree_solid_collapse_2.png
  15. BIN
      dist/images/1x/icon/tree_solid_collapse_3.png
  16. BIN
      dist/images/1x/icon/tree_solid_collapse_4.png
  17. BIN
      dist/images/1x/icon/tree_solid_collapse_5.png
  18. BIN
      dist/images/1x/icon/tree_solid_expand_1.png
  19. BIN
      dist/images/1x/icon/tree_solid_expand_2.png
  20. BIN
      dist/images/1x/icon/tree_solid_expand_3.png
  21. BIN
      dist/images/1x/icon/tree_solid_expand_4.png
  22. BIN
      dist/images/1x/icon/tree_solid_expand_5.png
  23. BIN
      dist/images/1x/icon/tree_solid_vertical_line_1.png
  24. BIN
      dist/images/1x/icon/tree_solid_vertical_line_2.png
  25. BIN
      dist/images/1x/icon/tree_solid_vertical_line_3.png
  26. BIN
      dist/images/1x/icon/tree_solid_vertical_line_4.png
  27. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_2.png
  28. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_3.png
  29. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_4.png
  30. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_5.png
  31. BIN
      dist/images/2x/icon/dark/tree_solid_expand_2.png
  32. BIN
      dist/images/2x/icon/dark/tree_solid_expand_3.png
  33. BIN
      dist/images/2x/icon/dark/tree_solid_expand_4.png
  34. BIN
      dist/images/2x/icon/dark/tree_solid_expand_5.png
  35. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_1.png
  36. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_2.png
  37. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_3.png
  38. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_4.png
  39. BIN
      dist/images/2x/icon/tree_solid_collapse_2.png
  40. BIN
      dist/images/2x/icon/tree_solid_collapse_3.png
  41. BIN
      dist/images/2x/icon/tree_solid_collapse_4.png
  42. BIN
      dist/images/2x/icon/tree_solid_collapse_5.png
  43. BIN
      dist/images/2x/icon/tree_solid_expand_2.png
  44. BIN
      dist/images/2x/icon/tree_solid_expand_3.png
  45. BIN
      dist/images/2x/icon/tree_solid_expand_4.png
  46. BIN
      dist/images/2x/icon/tree_solid_expand_5.png
  47. BIN
      dist/images/2x/icon/tree_solid_vertical_line_1.png
  48. BIN
      dist/images/2x/icon/tree_solid_vertical_line_2.png
  49. BIN
      dist/images/2x/icon/tree_solid_vertical_line_3.png
  50. BIN
      dist/images/2x/icon/tree_solid_vertical_line_4.png
  51. 2
      src/less/base/combo/combo.textvalue.icon.less
  52. 2
      src/less/base/combo/combo.textvalue.less
  53. 5
      src/less/base/tree/tree.expander.less
  54. 2
      src/less/base/tree/ztree.less
  55. 1
      src/less/lib/theme.less
  56. 2
      src/widget/editor/editor.text.js

BIN
dist/images/1x/icon/dark/tree_solid_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 340 B

BIN
dist/images/1x/icon/dark/tree_solid_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 353 B

BIN
dist/images/1x/icon/dark/tree_solid_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 339 B

BIN
dist/images/1x/icon/dark/tree_solid_collapse_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 316 B

BIN
dist/images/1x/icon/dark/tree_solid_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 302 B

BIN
dist/images/1x/icon/dark/tree_solid_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 320 B

BIN
dist/images/1x/icon/dark/tree_solid_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 306 B

BIN
dist/images/1x/icon/dark/tree_solid_expand_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 282 B

BIN
dist/images/1x/icon/dark/tree_solid_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 151 B

BIN
dist/images/1x/icon/dark/tree_solid_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 169 B

BIN
dist/images/1x/icon/dark/tree_solid_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 180 B

BIN
dist/images/1x/icon/dark/tree_solid_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 171 B

BIN
dist/images/1x/icon/tree_solid_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 331 B

BIN
dist/images/1x/icon/tree_solid_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 384 B

BIN
dist/images/1x/icon/tree_solid_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 394 B

BIN
dist/images/1x/icon/tree_solid_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

After

Width:  |  Height:  |  Size: 378 B

BIN
dist/images/1x/icon/tree_solid_collapse_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 356 B

BIN
dist/images/1x/icon/tree_solid_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 275 B

BIN
dist/images/1x/icon/tree_solid_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 328 B

BIN
dist/images/1x/icon/tree_solid_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 344 B

BIN
dist/images/1x/icon/tree_solid_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 334 B

After

Width:  |  Height:  |  Size: 329 B

BIN
dist/images/1x/icon/tree_solid_expand_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 303 B

BIN
dist/images/1x/icon/tree_solid_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 152 B

BIN
dist/images/1x/icon/tree_solid_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 169 B

BIN
dist/images/1x/icon/tree_solid_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 180 B

BIN
dist/images/1x/icon/tree_solid_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 171 B

BIN
dist/images/2x/icon/dark/tree_solid_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 454 B

BIN
dist/images/2x/icon/dark/tree_solid_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 494 B

BIN
dist/images/2x/icon/dark/tree_solid_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 462 B

BIN
dist/images/2x/icon/dark/tree_solid_collapse_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 417 B

BIN
dist/images/2x/icon/dark/tree_solid_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

BIN
dist/images/2x/icon/dark/tree_solid_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 431 B

After

Width:  |  Height:  |  Size: 431 B

BIN
dist/images/2x/icon/dark/tree_solid_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 401 B

BIN
dist/images/2x/icon/dark/tree_solid_expand_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 352 B

BIN
dist/images/2x/icon/dark/tree_solid_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 178 B

BIN
dist/images/2x/icon/dark/tree_solid_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 217 B

BIN
dist/images/2x/icon/dark/tree_solid_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 255 B

BIN
dist/images/2x/icon/dark/tree_solid_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 215 B

BIN
dist/images/2x/icon/tree_solid_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 505 B

BIN
dist/images/2x/icon/tree_solid_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 547 B

BIN
dist/images/2x/icon/tree_solid_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 B

After

Width:  |  Height:  |  Size: 515 B

BIN
dist/images/2x/icon/tree_solid_collapse_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 468 B

BIN
dist/images/2x/icon/tree_solid_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 419 B

BIN
dist/images/2x/icon/tree_solid_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 458 B

BIN
dist/images/2x/icon/tree_solid_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 429 B

After

Width:  |  Height:  |  Size: 429 B

BIN
dist/images/2x/icon/tree_solid_expand_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 381 B

BIN
dist/images/2x/icon/tree_solid_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 178 B

BIN
dist/images/2x/icon/tree_solid_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 217 B

BIN
dist/images/2x/icon/tree_solid_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 255 B

BIN
dist/images/2x/icon/tree_solid_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 215 B

2
src/less/base/combo/combo.textvalue.icon.less

@ -7,7 +7,7 @@
color: @color-bi-text-error-hover-text-value-icon-combo;
}
}
&>.bi-border, &>.bi-border-bottom {
&.bi-border, &.bi-border-bottom {
border-color: @border-color-negative;
}
}

2
src/less/base/combo/combo.textvalue.less

@ -7,7 +7,7 @@
color: @color-bi-text-error-hover-text-value-combo;
}
}
&>.bi-border, &>.bi-border-bottom {
&.bi-border, &.bi-border-bottom {
border-color: @border-color-negative;
}
}

5
src/less/base/tree/tree.expander.less

@ -12,3 +12,8 @@
left: 15px;
}
.bi-theme-dark {
.bi-tree-expander-popup.line.solid:before {
border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark;
}
}

2
src/less/base/tree/ztree.less

@ -62,7 +62,7 @@
}
.ztree.solid li ul.line {
&:before {
border-left: 1px solid @border-color-dark-gray-line;
border-left: 1px solid @border-color-dark-gray-line-theme-dark;
}
}
}

1
src/less/lib/theme.less

@ -197,6 +197,7 @@
// tree
@color-bi-text-display-tree: @color-bi-text-gray;
@color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line;
@color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark;
// popup
@color-bi-background-list-view-shadow: @color-bi-background-black;
@color-bi-border-list-view-toolbar: @color-bi-border-line;

2
src/widget/editor/editor.text.js

@ -80,6 +80,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
this.editor.on(BI.Editor.EVENT_VALID, function () {
self.element.removeClass("error");
self.fireEvent(BI.TextEditor.EVENT_VALID);
});
this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
@ -101,6 +102,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.TextEditor.EVENT_STOP);
});
this.editor.on(BI.Editor.EVENT_ERROR, function () {
self.element.addClass("error");
self.fireEvent(BI.TextEditor.EVENT_ERROR, arguments);
});
this.editor.on(BI.Editor.EVENT_ENTER, function () {

Loading…
Cancel
Save