From bfbcaa3200ad37039a6f0d57ed1818ab8eabbc2d Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 23 Aug 2020 02:06:16 +0800 Subject: [PATCH] bugfix --- dist/images/2x/background/auto_color.png | Bin 1651 -> 0 bytes .../2x/background/auto_color_normal.png | Bin 1379 -> 1651 bytes dist/images/2x/background/trans_color.png | Bin 534 -> 0 bytes src/case/colorchooser/colorchooser.trigger.js | 10 +++++----- .../colorchooser/colorchooser.trigger.long.js | 10 +++++----- src/less/lib/background.less | 12 ++++++++---- 6 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 dist/images/2x/background/auto_color.png delete mode 100644 dist/images/2x/background/trans_color.png diff --git a/dist/images/2x/background/auto_color.png b/dist/images/2x/background/auto_color.png deleted file mode 100644 index 2085e7c23f27822d6e152b81e966aef9d2872418..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1651 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 diff --git a/dist/images/2x/background/trans_color.png b/dist/images/2x/background/trans_color.png deleted file mode 100644 index 663a84262f64653217acf08cf61868c8ce6fcca7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmV+x0_pvUP)Px$&`Cr=RA>d&+PzM~P#DJX^By5VM@vFX^cuVc*DhWGUV@7zCc3-07*{7IoQ#`` z3s+$D2Am9vq&R6BF+KK$Hjx0@kMr^L3_x0j-~Y7Rdq~792tGHzqwq`!wWE~S;A^Oh zNW2I^y_#$sdEVMHF@79{k3y++RP;g@(WovP+hQ;rbzk2C6@TAy%)&o|T>SF={jj~) z5AGkH5_6XZ!=TTvO?_o`iysMyb&fIi{S&3sDc?|DGkQP2ko-Ey^qsE?o&)44xS52+ z8!!0>^7_5=>?ESQTC3Gg&Cmf$@VnIMgzy1b@Eig81hV2G1M=YE0`lUa0*c^a0*c}x z0?Oc>2b9G-4bXvi7N867BtR$LdVp@c)c_NCYXPS4Rsu}ojR%;<8x635Hx^(EZzRAb zUVDITyw(60cx?f$@LB>~;!6j(#+M2}z!wfc!50cZ!siY^!{-V>#Agmb#b*jY#{V0D zj{h^D3izb~RlzR|s1klIplbM;03ITzb6CESOao^IYJ44SO@_scioE7=ibKbzCkiHm zZaz4{@Q;JTkSE|V{yLt+!tQ)>Fy(T(+0?82VGqei4EWSXyz^Jnqb$=l)K50DmCbDb Y0Xpp2rkVV3bpQYW07*qoM6N<$f_KO89smFU 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";