Browse Source

Pull request #1448: bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'bfbcaa3200ad37039a6f0d57ed1818ab8eabbc2d':
  bugfix
es6
guy 4 years ago
parent
commit
05a28ac390
  1. BIN
      dist/images/2x/background/auto_color.png
  2. BIN
      dist/images/2x/background/auto_color_normal.png
  3. BIN
      dist/images/2x/background/trans_color.png
  4. 8
      src/case/colorchooser/colorchooser.trigger.js
  5. 8
      src/case/colorchooser/colorchooser.trigger.long.js
  6. 10
      src/less/lib/background.less

BIN
dist/images/2x/background/auto_color.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/images/2x/background/auto_color_normal.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/images/2x/background/trans_color.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 534 B

8
src/case/colorchooser/colorchooser.trigger.js

@ -35,10 +35,10 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
element: this,
items: [{
el: this.colorContainer,
left: 3,
right: 3,
top: 3,
bottom: 3
left: 2,
right: 2,
top: 2,
bottom: 2
}, {
el: down,
right: -1,

8
src/case/colorchooser/colorchooser.trigger.long.js

@ -58,10 +58,10 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
element: this,
items: [{
el: this.colorContainer,
left: 3,
right: 3,
top: 3,
bottom: 3
left: 2,
right: 2,
top: 2,
bottom: 2
}, {
el: down,
right: 3,

10
src/less/lib/background.less

@ -1,6 +1,10 @@
@background-auto-color: "background/auto_color.png";
@background-auto-color-normal: "background/auto_color_normal.png";
@background-auto-color-normal-disabled: "background/auto_color_normal_disable.png";
//右下角放置小三角
@background-auto-color: "background/auto_color_normal.png";
@background-auto-color-disabled: "background/auto_color_disable.png";
//右下角没有小三角
@background-auto-color-normal: "icon/auto_normal.png";
@background-auto-color-normal-disabled: "icon/auto_disable.png";
@background-trans-color: "background/trans_normal.png";
@background-trans-color-disabled: "background/trans_disable.png";

Loading…
Cancel
Save