Browse Source

update

master
guy 7 years ago
parent
commit
a809018bd8
  1. 18
      dist/_fineui.min.js
  2. 24
      dist/bundle.css
  3. 6
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 12
      dist/bundle.min.js
  6. 6
      dist/case.js
  7. 24
      dist/fineui.css
  8. 2
      dist/fineui.min.css
  9. 18
      dist/fineui.min.js
  10. 24
      dist/resource.css
  11. 24
      public/css/icon.css
  12. 6
      src/case/colorchooser/colorchooser.trigger.long.js
  13. 24
      src/css/resource/icon.css
  14. 2
      src/less/resource/icon.less
  15. 24
      ui/css/icon.css

18
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

24
dist/bundle.css vendored

@ -6806,30 +6806,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/slider_normal_small.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/slider_normal_small.png');
_background: none; _background: none;
} }
.static-auto-color-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png');
background-size: contain;
_background: none;
}
.static-auto-color-icon .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/auto_normal.png');
_background: none;
}
.static-trans-color-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/trans_normal.png');
background-size: contain;
_background: none;
}
.static-trans-color-icon .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/trans_normal.png');
_background: none;
}
.auto-color-icon .x-icon { .auto-color-icon .x-icon {
display: block; display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png') no-repeat center center;

6
dist/bundle.js vendored

@ -76544,7 +76544,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
ref: function (_ref) { ref: function (_ref) {
self.changeIcon = _ref; self.changeIcon = _ref;
}, },
iconCls: "static-auto-color-icon", iconCls: "auto-color-icon",
width: 24, width: 24,
iconWidth: 16, iconWidth: 16,
iconHeight: 16 iconHeight: 16
@ -76596,13 +76596,13 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
this.colorContainer.element.css("background-color", ""); this.colorContainer.element.css("background-color", "");
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.label.setVisible(true); this.label.setVisible(true);
this.changeIcon.setIcon("static-auto-color-icon"); this.changeIcon.setIcon("auto-color-icon");
this.label.setText(BI.i18nText("BI-Basic_Auto")); this.label.setText(BI.i18nText("BI-Basic_Auto"));
} else if (color === "transparent") { } else if (color === "transparent") {
this.colorContainer.element.css("background-color", ""); this.colorContainer.element.css("background-color", "");
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.label.setVisible(true); this.label.setVisible(true);
this.changeIcon.setIcon("static-trans-color-icon"); this.changeIcon.setIcon("trans-color-icon");
this.label.setText(BI.i18nText("BI-Transparent_Color")); this.label.setText(BI.i18nText("BI-Transparent_Color"));
} else { } else {
this.colorContainer.element.css({"background-color": color}); this.colorContainer.element.css({"background-color": color});

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

12
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/case.js vendored

@ -4095,7 +4095,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
ref: function (_ref) { ref: function (_ref) {
self.changeIcon = _ref; self.changeIcon = _ref;
}, },
iconCls: "static-auto-color-icon", iconCls: "auto-color-icon",
width: 24, width: 24,
iconWidth: 16, iconWidth: 16,
iconHeight: 16 iconHeight: 16
@ -4147,13 +4147,13 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
this.colorContainer.element.css("background-color", ""); this.colorContainer.element.css("background-color", "");
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.label.setVisible(true); this.label.setVisible(true);
this.changeIcon.setIcon("static-auto-color-icon"); this.changeIcon.setIcon("auto-color-icon");
this.label.setText(BI.i18nText("BI-Basic_Auto")); this.label.setText(BI.i18nText("BI-Basic_Auto"));
} else if (color === "transparent") { } else if (color === "transparent") {
this.colorContainer.element.css("background-color", ""); this.colorContainer.element.css("background-color", "");
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.label.setVisible(true); this.label.setVisible(true);
this.changeIcon.setIcon("static-trans-color-icon"); this.changeIcon.setIcon("trans-color-icon");
this.label.setText(BI.i18nText("BI-Transparent_Color")); this.label.setText(BI.i18nText("BI-Transparent_Color"));
} else { } else {
this.colorContainer.element.css({"background-color": color}); this.colorContainer.element.css({"background-color": color});

24
dist/fineui.css vendored

@ -6806,30 +6806,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/slider_normal_small.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/slider_normal_small.png');
_background: none; _background: none;
} }
.static-auto-color-icon .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png');
background-size: contain;
_background: none;
}
.static-auto-color-icon .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/auto_normal.png');
_background: none;
}
.static-trans-color-icon .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/trans_normal.png');
background-size: contain;
_background: none;
}
.static-trans-color-icon .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/trans_normal.png');
_background: none;
}
.auto-color-icon .x-icon { .auto-color-icon .x-icon {
display: block; display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png') no-repeat center center;

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

18
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

24
dist/resource.css vendored

@ -1594,30 +1594,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/slider_normal_small.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/slider_normal_small.png');
_background: none; _background: none;
} }
.static-auto-color-icon .x-icon {
display: block;
background: url('images/2x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/auto_normal.png');
background-size: contain;
_background: none;
}
.static-auto-color-icon .x-icon.hack {
background: url('images/1x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/auto_normal.png');
_background: none;
}
.static-trans-color-icon .x-icon {
display: block;
background: url('images/2x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/trans_normal.png');
background-size: contain;
_background: none;
}
.static-trans-color-icon .x-icon.hack {
background: url('images/1x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/trans_normal.png');
_background: none;
}
.auto-color-icon .x-icon { .auto-color-icon .x-icon {
display: block; display: block;
background: url('images/2x/icon/auto_normal.png') no-repeat center center; background: url('images/2x/icon/auto_normal.png') no-repeat center center;

24
public/css/icon.css

@ -460,30 +460,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/slider_normal_small.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/slider_normal_small.png');
_background: none; _background: none;
} }
.static-auto-color-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png');
background-size: contain;
_background: none;
}
.static-auto-color-icon .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/auto_normal.png');
_background: none;
}
.static-trans-color-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/trans_normal.png');
background-size: contain;
_background: none;
}
.static-trans-color-icon .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/trans_normal.png');
_background: none;
}
.auto-color-icon .x-icon { .auto-color-icon .x-icon {
display: block; display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/auto_normal.png') no-repeat center center;

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

@ -26,7 +26,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
ref: function (_ref) { ref: function (_ref) {
self.changeIcon = _ref; self.changeIcon = _ref;
}, },
iconCls: "static-auto-color-icon", iconCls: "auto-color-icon",
width: 24, width: 24,
iconWidth: 16, iconWidth: 16,
iconHeight: 16 iconHeight: 16
@ -78,13 +78,13 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
this.colorContainer.element.css("background-color", ""); this.colorContainer.element.css("background-color", "");
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.label.setVisible(true); this.label.setVisible(true);
this.changeIcon.setIcon("static-auto-color-icon"); this.changeIcon.setIcon("auto-color-icon");
this.label.setText(BI.i18nText("BI-Basic_Auto")); this.label.setText(BI.i18nText("BI-Basic_Auto"));
} else if (color === "transparent") { } else if (color === "transparent") {
this.colorContainer.element.css("background-color", ""); this.colorContainer.element.css("background-color", "");
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.label.setVisible(true); this.label.setVisible(true);
this.changeIcon.setIcon("static-trans-color-icon"); this.changeIcon.setIcon("trans-color-icon");
this.label.setText(BI.i18nText("BI-Transparent_Color")); this.label.setText(BI.i18nText("BI-Transparent_Color"));
} else { } else {
this.colorContainer.element.css({"background-color": color}); this.colorContainer.element.css({"background-color": color});

24
src/css/resource/icon.css

@ -460,30 +460,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/slider_normal_small.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/slider_normal_small.png');
_background: none; _background: none;
} }
.static-auto-color-icon .x-icon {
display: block;
background: url('images/2x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/auto_normal.png');
background-size: contain;
_background: none;
}
.static-auto-color-icon .x-icon.hack {
background: url('images/1x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/auto_normal.png');
_background: none;
}
.static-trans-color-icon .x-icon {
display: block;
background: url('images/2x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/trans_normal.png');
background-size: contain;
_background: none;
}
.static-trans-color-icon .x-icon.hack {
background: url('images/1x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/trans_normal.png');
_background: none;
}
.auto-color-icon .x-icon { .auto-color-icon .x-icon {
display: block; display: block;
background: url('images/2x/icon/auto_normal.png') no-repeat center center; background: url('images/2x/icon/auto_normal.png') no-repeat center center;

2
src/less/resource/icon.less

@ -70,7 +70,5 @@
.icon_hover(slider-icon, @icon-slider-normal, @icon-slider-active); .icon_hover(slider-icon, @icon-slider-normal, @icon-slider-active);
//颜色自动、透明 //颜色自动、透明
.icon(static-auto-color-icon, @icon-auto-normal);
.icon(static-trans-color-icon, @icon-trans-normal);
.icon_select(auto-color-icon, @icon-auto-normal, @icon-auto-select, @icon-auto-disable); .icon_select(auto-color-icon, @icon-auto-normal, @icon-auto-select, @icon-auto-disable);
.icon_select(trans-color-icon, @icon-trans-normal, @icon-trans-select, @icon-trans-disable); .icon_select(trans-color-icon, @icon-trans-normal, @icon-trans-select, @icon-trans-disable);

24
ui/css/icon.css

@ -460,30 +460,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/slider_normal_small.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/slider_normal_small.png');
_background: none; _background: none;
} }
.static-auto-color-icon .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png');
background-size: contain;
_background: none;
}
.static-auto-color-icon .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/auto_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/auto_normal.png');
_background: none;
}
.static-trans-color-icon .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/trans_normal.png');
background-size: contain;
_background: none;
}
.static-trans-color-icon .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/trans_normal.png');
_background: none;
}
.auto-color-icon .x-icon { .auto-color-icon .x-icon {
display: block; display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/2x/icon/auto_normal.png') no-repeat center center;

Loading…
Cancel
Save