diff --git a/dist/images/2x/background/auto_color.png b/dist/images/2x/background/auto_color.png deleted file mode 100644 index 2085e7c23..000000000 Binary files a/dist/images/2x/background/auto_color.png and /dev/null differ diff --git a/dist/images/2x/background/auto_color_normal.png b/dist/images/2x/background/auto_color_normal.png index 527212c10..2085e7c23 100644 Binary files a/dist/images/2x/background/auto_color_normal.png and b/dist/images/2x/background/auto_color_normal.png differ diff --git a/dist/images/2x/background/trans_color.png b/dist/images/2x/background/trans_color.png deleted file mode 100644 index 663a84262..000000000 Binary files a/dist/images/2x/background/trans_color.png and /dev/null differ diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js index 07101ae3a..ab1ad1862 100644 --- a/src/case/colorchooser/colorchooser.trigger.js +++ b/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); \ No newline at end of file +BI.shortcut("bi.color_chooser_trigger", BI.ColorChooserTrigger); diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js index 0c947bd1d..74421ce73 100644 --- a/src/case/colorchooser/colorchooser.trigger.long.js +++ b/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); \ No newline at end of file +BI.shortcut("bi.long_color_chooser_trigger", BI.LongColorChooserTrigger); diff --git a/src/less/lib/background.less b/src/less/lib/background.less index b82907e73..409a23f38 100644 --- a/src/less/lib/background.less +++ b/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"; \ No newline at end of file +@background-farbtastic-marker:"background/marker.png";