Browse Source

Merge pull request #161 in ~GUY/fineui from ~IMP/fineui_guy:master to master

* commit '3525e81cbfc3ffbf220c954eda5bf1dd39f889c6':
  update
master
imp 7 years ago
parent
commit
a5706ab161
  1. 2
      bi/slider.js
  2. 30
      bi/widget.css
  3. 2
      dist/slider.js
  4. 30
      dist/widget.css
  5. 2
      src/addons/slider/css/singleslider/slider/widget.slider.css
  6. 4
      src/addons/slider/less/singleslider/slider/widget.slider.less
  7. 2
      src/addons/slider/singleslider/button/iconbutton.slider.js
  8. 5
      src/less/resource/cursor.less

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: "widget-slider-icon slider-button cursor-drag",
iconWidth: 14, iconWidth: 14,
iconHeight: 14, iconHeight: 14,
height: 14, height: 14,

30
bi/widget.css

@ -429,8 +429,38 @@
box-sizing: border-box; box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ /*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
} }
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-single-slider-button .slider-button {
-webkit-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);
-webkit-border-radius: 7px;
-moz-border-radius: 7px;
border-radius: 7px;
}
.bi-slider-track .gray-track {
background-color: rgba(153, 153, 153, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-slider-track .blue-track {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-slider .bi-slider-track {
background-color: rgba(153, 153, 153, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-param-time-interval.time-error .bi-input { .bi-param-time-interval.time-error .bi-input {
color: #e85050; color: #e85050;
} }

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: "widget-slider-icon slider-button cursor-drag",
iconWidth: 14, iconWidth: 14,
iconHeight: 14, iconHeight: 14,
height: 14, height: 14,

30
dist/widget.css vendored

@ -429,8 +429,38 @@
box-sizing: border-box; box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ /*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
} }
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-single-slider-button .slider-button {
-webkit-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);
-webkit-border-radius: 7px;
-moz-border-radius: 7px;
border-radius: 7px;
}
.bi-slider-track .gray-track {
background-color: rgba(153, 153, 153, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-slider-track .blue-track {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-slider .bi-slider-track {
background-color: rgba(153, 153, 153, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-param-time-interval.time-error .bi-input { .bi-param-time-interval.time-error .bi-input {
color: #e85050; color: #e85050;
} }

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);

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

@ -1,5 +1,5 @@
@import "../../../../../less/bibase"; @import "../../../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: "widget-slider-icon slider-button cursor-drag",
iconWidth: 14, iconWidth: 14,
iconHeight: 14, iconHeight: 14,
height: 14, height: 14,

5
src/less/resource/cursor.less

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