From fb8fb27600af8f3dcaad1d4c53e30cfb06d3ade6 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 19 Sep 2017 12:06:59 +0800 Subject: [PATCH 1/2] update --- dist/index.html | 1 + dist/resource.css | 2 +- src/addons/slider/less/singleslider/slider/widget.slider.less | 2 +- src/css/resource/cursor.css | 2 +- src/less/var.less | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dist/index.html b/dist/index.html index 1ffaf815b..07877b6b1 100644 --- a/dist/index.html +++ b/dist/index.html @@ -9,6 +9,7 @@ + diff --git a/dist/resource.css b/dist/resource.css index c23f601f4..f122ba305 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -133,7 +133,7 @@ textarea::-webkit-scrollbar-thumb:hover { _background: none; } .cursor-drag { - cursor: url('images/1x/cursor/cursor_drag_slider.cur'), auto; + cursor: url('cursor/cursor_drag_hand.cur'), auto; } @font-face { font-family: 'bi'; diff --git a/src/addons/slider/less/singleslider/slider/widget.slider.less b/src/addons/slider/less/singleslider/slider/widget.slider.less index 2a3a12f0d..78ea7226f 100644 --- a/src/addons/slider/less/singleslider/slider/widget.slider.less +++ b/src/addons/slider/less/singleslider/slider/widget.slider.less @@ -1,4 +1,4 @@ -@import "../../../bibase"; +@import "../../../../../less/bibase"; .bi-single-slider-button{ & .slider-button{ .box-shadow(0 0 10px, rgba(0, 0, 0, 0.2)); diff --git a/src/css/resource/cursor.css b/src/css/resource/cursor.css index bfd157219..bd57fc0d0 100644 --- a/src/css/resource/cursor.css +++ b/src/css/resource/cursor.css @@ -1,3 +1,3 @@ .cursor-drag { - cursor: url('images/1x/cursor/cursor_drag_slider.cur'), auto; + cursor: url('cursor/cursor_drag_hand.cur'), auto; } diff --git a/src/less/var.less b/src/less/var.less index dabfe3ef0..e1a3eb5bf 100644 --- a/src/less/var.less +++ b/src/less/var.less @@ -5,7 +5,7 @@ @cursor: '@{webUrl}images/cursor/cursor_hand.cur'; @dragCursor: '@{webUrl}images/cursor/cursor_drag_hand.cur'; @leftRightCursor: '@{webUrl}images/cursor/cursor_left_right.cur'; -@sliderDragCursor: '@{imageUrl}cursor/cursor_drag_slider.cur'; +@sliderDragCursor: '@{webUrl}cursor/cursor_drag_hand.cur'; @zIndex-layer: 100000; @zIndex-floatbox: 1000000; From f6dcbad62998152dc81c21d33fb4ddf9d4ff3494 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 19 Sep 2017 12:10:22 +0800 Subject: [PATCH 2/2] update --- bi/slider.js | 2 +- dist/slider.js | 2 +- src/addons/slider/singleslider/button/iconbutton.slider.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bi/slider.js b/bi/slider.js index 3f2ab4d33..e1c52b3e7 100644 --- a/bi/slider.js +++ b/bi/slider.js @@ -11,7 +11,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); this.slider = BI.createWidget({ type: "bi.icon_button", - cls: "widget-slider-icon slider-button cursor-drag", + cls: "cursor-drag widget-slider-icon slider-button", iconWidth: 14, iconHeight: 14, height: 14, diff --git a/dist/slider.js b/dist/slider.js index 3f2ab4d33..e1c52b3e7 100644 --- a/dist/slider.js +++ b/dist/slider.js @@ -11,7 +11,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); this.slider = BI.createWidget({ type: "bi.icon_button", - cls: "widget-slider-icon slider-button cursor-drag", + cls: "cursor-drag widget-slider-icon slider-button", iconWidth: 14, iconHeight: 14, height: 14, diff --git a/src/addons/slider/singleslider/button/iconbutton.slider.js b/src/addons/slider/singleslider/button/iconbutton.slider.js index bd4ea3ee0..9ce90ad98 100644 --- a/src/addons/slider/singleslider/button/iconbutton.slider.js +++ b/src/addons/slider/singleslider/button/iconbutton.slider.js @@ -11,7 +11,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); this.slider = BI.createWidget({ type: "bi.icon_button", - cls: "widget-slider-icon slider-button cursor-drag", + cls: "cursor-drag widget-slider-icon slider-button", iconWidth: 14, iconHeight: 14, height: 14,