Browse Source

Pull request #2213: BI-94912 fix:修改选中的自动图标

Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master

* commit '95c5de7b939058a598b26e6b09187dfa0887bbb1':
  BI-94912 fix:修改选中的自动图标
es6
Claire.Tang 3 years ago
parent
commit
ccc6920f5c
  1. BIN
      dist/images/1x/icon/auto_no_square_normal.png
  2. BIN
      dist/images/2x/icon/auto_no_square_normal.png
  3. 2
      src/case/colorchooser/colorpicker/button/button.colorpicker.js
  4. 1
      src/less/lib/background.less
  5. 10
      src/less/resource/background.less

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

2
src/case/colorchooser/colorpicker/button/button.colorpicker.js

@ -19,7 +19,7 @@ BI.ColorPickerButton = BI.inherit(BI.BasicButton, {
var self = this, o = this.options; var self = this, o = this.options;
if (BI.isNotNull(o.value)) { if (BI.isNotNull(o.value)) {
if (o.value === '') { if (o.value === '') {
this.element.addClass("auto-color-square-normal-background"); this.element.addClass("auto-color-no-square-normal-background");
} else if (o.value === "transparent") { } else if (o.value === "transparent") {
this.element.addClass("trans-color-background"); this.element.addClass("trans-color-background");
} else { } else {

1
src/less/lib/background.less

@ -7,6 +7,7 @@
@background-trans-color: "background/trans_normal.png"; @background-trans-color: "background/trans_normal.png";
@background-trans-color-disabled: "background/trans_disable.png"; @background-trans-color-disabled: "background/trans_disable.png";
@background-auto-color-square-normal: "icon/auto_square_normal.png"; @background-auto-color-square-normal: "icon/auto_square_normal.png";
@background-auto-color-no-square-normal: "icon/auto_no_square_normal";
@background-farbtastic-wheel:"background/wheel.png"; @background-farbtastic-wheel:"background/wheel.png";
@background-farbtastic-overlay:"background/mask.png"; @background-farbtastic-overlay:"background/mask.png";

10
src/less/resource/background.less

@ -325,6 +325,10 @@
.image2xPath(@background-auto-color-square-normal); .image2xPath(@background-auto-color-square-normal);
} }
.auto-color-no-square-normal-background {
.image2xPath(@background-auto-color-no-square-normal);
}
.trans-color-background { .trans-color-background {
.image2xPath(@background-trans-color); .image2xPath(@background-trans-color);
} }
@ -357,6 +361,12 @@
} }
} }
.auto-color-no-square-normal-background {
&.hack{
.imagePath(@background-auto-color-no-square-normal);
}
}
.trans-color-background { .trans-color-background {
&.hack{ &.hack{
.imagePath(@background-trans-color); .imagePath(@background-trans-color);

Loading…
Cancel
Save