Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #820 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'a5e5f3319c5565781c33bfba7449a4d1db70b116':
  无JIRA任务 color_chooser下拉三角大小改一下
master
windy 6 years ago
parent
324a1fbda9 a5e5f3319c
commit
7872c5b224
20 changed files with 99 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      dist/bundle.css
  2. 4
      dist/bundle.ie.js
  3. 4
      dist/bundle.ie.min.js
  4. 4
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 8
      dist/bundle.min.js
  7. 4
      dist/case.js
  8. 12
      dist/fineui.css
  9. 4
      dist/fineui.ie.js
  10. 4
      dist/fineui.ie.min.js
  11. 4
      dist/fineui.js
  12. 2
      dist/fineui.min.css
  13. 8
      dist/fineui.min.js
  14. 12
      dist/resource.css
  15. 2
      dist/utils.min.js
  16. 12
      public/css/icon.css
  17. 2
      src/case/colorchooser/colorchooser.trigger.js
  18. 2
      src/case/colorchooser/colorchooser.trigger.long.js
  19. 12
      src/css/resource/icon.css
  20. 12
      ui/css/icon.css

12
dist/bundle.css vendored
Unescape View File

@ -5891,6 +5891,18 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
_background: none; _background: none;
} }
.check-half-select-icon.disabled .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected_disable.png');
background-size: contain;
_background: none;
}
.check-half-select-icon.disabled .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected_disable.png');
_background: none;
}
.slider-icon .x-icon { .slider-icon .x-icon {
display: block; display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/slider_normal_small.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/slider_normal_small.png') no-repeat center center;

4
dist/bundle.ie.js vendored
Unescape View File

@ -51870,7 +51870,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -51956,7 +51956,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

4
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored
Unescape View File

@ -52274,7 +52274,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -52360,7 +52360,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/case.js vendored
Unescape View File

@ -2670,7 +2670,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -2756,7 +2756,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

12
dist/fineui.css vendored
Unescape View File

@ -5891,6 +5891,18 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
_background: none; _background: none;
} }
.check-half-select-icon.disabled .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected_disable.png');
background-size: contain;
_background: none;
}
.check-half-select-icon.disabled .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected_disable.png');
_background: none;
}
.slider-icon .x-icon { .slider-icon .x-icon {
display: block; display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/slider_normal_small.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/2x/icon/slider_normal_small.png') no-repeat center center;

4
dist/fineui.ie.js vendored
Unescape View File

@ -52115,7 +52115,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -52201,7 +52201,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored
Unescape View File

@ -52519,7 +52519,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -52605,7 +52605,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/resource.css vendored
Unescape View File

@ -1729,6 +1729,18 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
_background: none; _background: none;
} }
.check-half-select-icon.disabled .x-icon {
display: block;
background: url('images/2x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected_disable.png');
background-size: contain;
_background: none;
}
.check-half-select-icon.disabled .x-icon.hack {
background: url('images/1x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected_disable.png');
_background: none;
}
.slider-icon .x-icon { .slider-icon .x-icon {
display: block; display: block;
background: url('images/2x/icon/slider_normal_small.png') no-repeat center center; background: url('images/2x/icon/slider_normal_small.png') no-repeat center center;

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/css/icon.css
Unescape View File

@ -422,6 +422,18 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
_background: none; _background: none;
} }
.check-half-select-icon.disabled .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected_disable.png');
background-size: contain;
_background: none;
}
.check-half-select-icon.disabled .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected_disable.png');
_background: none;
}
.slider-icon .x-icon { .slider-icon .x-icon {
display: block; display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/slider_normal_small.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/slider_normal_small.png') no-repeat center center;

2
src/case/colorchooser/colorchooser.trigger.js
Unescape View File

@ -25,7 +25,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

2
src/case/colorchooser/colorchooser.trigger.long.js
Unescape View File

@ -47,7 +47,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

12
src/css/resource/icon.css
Unescape View File

@ -422,6 +422,18 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
_background: none; _background: none;
} }
.check-half-select-icon.disabled .x-icon {
display: block;
background: url('images/2x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected_disable.png');
background-size: contain;
_background: none;
}
.check-half-select-icon.disabled .x-icon.hack {
background: url('images/1x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected_disable.png');
_background: none;
}
.slider-icon .x-icon { .slider-icon .x-icon {
display: block; display: block;
background: url('images/2x/icon/slider_normal_small.png') no-repeat center center; background: url('images/2x/icon/slider_normal_small.png') no-repeat center center;

12
ui/css/icon.css
Unescape View File

@ -422,6 +422,18 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
_background: none; _background: none;
} }
.check-half-select-icon.disabled .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected_disable.png');
background-size: contain;
_background: none;
}
.check-half-select-icon.disabled .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected_disable.png');
_background: none;
}
.slider-icon .x-icon { .slider-icon .x-icon {
display: block; display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/slider_normal_small.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/2x/icon/slider_normal_small.png') no-repeat center center;

Write Preview
Loading…
Cancel
Save