Browse Source

Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

# Conflicts:
#	bi/base.js
es6
guy 7 years ago
parent
commit
c5fec017ea
  1. 2
      bi/slider.css
  2. 2
      bi/slider.js
  3. 1
      dist/index.html
  4. 3
      dist/resource.css
  5. 2
      dist/slider.css
  6. 2
      dist/slider.js
  7. 2
      src/addons/slider/css/singleslider/slider/widget.slider.css
  8. 2
      src/addons/slider/less/singleslider/slider/widget.slider.less
  9. 2
      src/addons/slider/singleslider/button/iconbutton.slider.js
  10. 3
      src/css/resource/cursor.css
  11. 5
      src/less/resource/cursor.less
  12. 2
      src/less/var.less

2
bi/slider.css

@ -1,4 +1,4 @@
.bi-single-slider-slider .slider-button { .bi-single-slider-button .slider-button {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

2
bi/slider.js

@ -11,7 +11,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ this.slider = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: "widget-slider-icon slider-button", cls: "cursor-drag widget-slider-icon slider-button",
iconWidth: 14, iconWidth: 14,
iconHeight: 14, iconHeight: 14,
height: 14, height: 14,

1
dist/index.html vendored

@ -9,6 +9,7 @@
<link rel="stylesheet" type="text/css" href="widget.css" /> <link rel="stylesheet" type="text/css" href="widget.css" />
<link rel="stylesheet" type="text/css" href="resource.css" /> <link rel="stylesheet" type="text/css" href="resource.css" />
<link rel="stylesheet" type="text/css" href="demo.css" /> <link rel="stylesheet" type="text/css" href="demo.css" />
<link rel="stylesheet" type="text/css" href="slider.css" />
<script src="config.js"></script> <script src="config.js"></script>
<script src="polyfill.js"></script> <script src="polyfill.js"></script>

3
dist/resource.css vendored

@ -132,6 +132,9 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans-color.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans-color.png');
_background: none; _background: none;
} }
.cursor-drag {
cursor: url('cursor/cursor_drag_hand.cur'), auto;
}
@font-face { @font-face {
font-family: 'bi'; font-family: 'bi';
src: url('font/iconfont.eot'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg'); src: url('font/iconfont.eot'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg');

2
dist/slider.css vendored

@ -1,4 +1,4 @@
.bi-single-slider-slider .slider-button { .bi-single-slider-button .slider-button {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

2
dist/slider.js vendored

@ -11,7 +11,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ this.slider = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: "widget-slider-icon slider-button", cls: "cursor-drag widget-slider-icon slider-button",
iconWidth: 14, iconWidth: 14,
iconHeight: 14, iconHeight: 14,
height: 14, height: 14,

2
src/addons/slider/css/singleslider/slider/widget.slider.css

@ -1,4 +1,4 @@
.bi-single-slider-slider .slider-button { .bi-single-slider-button .slider-button {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

2
src/addons/slider/less/singleslider/slider/widget.slider.less

@ -1,5 +1,5 @@
@import "../../../../../less/bibase"; @import "../../../../../less/bibase";
.bi-single-slider-slider{ .bi-single-slider-button{
& .slider-button{ & .slider-button{
.box-shadow(0 0 10px, rgba(0, 0, 0, 0.2)); .box-shadow(0 0 10px, rgba(0, 0, 0, 0.2));
.border-radius(7px); .border-radius(7px);

2
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)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ this.slider = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: "widget-slider-icon slider-button", cls: "cursor-drag widget-slider-icon slider-button",
iconWidth: 14, iconWidth: 14,
iconHeight: 14, iconHeight: 14,
height: 14, height: 14,

3
src/css/resource/cursor.css

@ -0,0 +1,3 @@
.cursor-drag {
cursor: url('cursor/cursor_drag_hand.cur'), auto;
}

5
src/less/resource/cursor.less

@ -0,0 +1,5 @@
@import "../var";
.cursor-drag {
cursor: url(@sliderDragCursor), auto;
}

2
src/less/var.less

@ -5,7 +5,7 @@
@cursor: '@{webUrl}images/cursor/cursor_hand.cur'; @cursor: '@{webUrl}images/cursor/cursor_hand.cur';
@dragCursor: '@{webUrl}images/cursor/cursor_drag_hand.cur'; @dragCursor: '@{webUrl}images/cursor/cursor_drag_hand.cur';
@leftRightCursor: '@{webUrl}images/cursor/cursor_left_right.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-layer: 100000;
@zIndex-floatbox: 1000000; @zIndex-floatbox: 1000000;

Loading…
Cancel
Save