Pull request #1448: bugfix

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

* commit 'bfbcaa3200ad37039a6f0d57ed1818ab8eabbc2d':
  bugfix

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,
@@ -62,4 +62,4 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     }
 });
 BI.ColorChooserTrigger.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.color_chooser_trigger", BI.ColorChooserTrigger);
+BI.shortcut("bi.color_chooser_trigger", BI.ColorChooserTrigger);

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,
@@ -95,4 +95,4 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     }
 });
 BI.LongColorChooserTrigger.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.long_color_chooser_trigger", BI.LongColorChooserTrigger);
+BI.shortcut("bi.long_color_chooser_trigger", BI.LongColorChooserTrigger);

src/less/lib/background.less

@@ -1,9 +1,13 @@
-@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";
 
 @background-farbtastic-wheel:"background/wheel.png";
 @background-farbtastic-overlay:"background/mask.png";
-@background-farbtastic-marker:"background/marker.png";
+@background-farbtastic-marker:"background/marker.png";