Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master)

* commit '4712d16aa575607a1708216e816cb9a2cc7e1f70':
  拖拽期间不发事件
  update
  BI-48769 refactor: 统一滚动条样式
es6
alan 5 years ago
parent
commit
bb63fc844e
  1. 60
      dist/2.0/fineui.css
  2. 1
      dist/2.0/fineui.ie.js
  3. 1
      dist/2.0/fineui.js
  4. 60
      dist/bundle.css
  5. 1
      dist/bundle.ie.js
  6. 1
      dist/bundle.js
  7. 60
      dist/fineui.css
  8. 1
      dist/fineui.ie.js
  9. 1
      dist/fineui.js
  10. 1
      dist/fineui_without_jquery_polyfill.js
  11. 60
      dist/resource.css
  12. 1
      dist/widget.js
  13. 60
      public/css/app.css
  14. 60
      src/css/resource/app.css
  15. 4
      src/less/lib/constant.less
  16. 34
      src/less/resource/app.less
  17. 1
      src/widget/singleslider/singleslider.js
  18. 60
      ui/css/app.css

60
dist/2.0/fineui.css vendored

@ -4664,44 +4664,64 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-farbtastic .wheel { .bi-farbtastic .wheel {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/wheel.png') no-repeat center center; background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/wheel.png') no-repeat center center;

1
dist/2.0/fineui.ie.js vendored

@ -82225,7 +82225,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

1
dist/2.0/fineui.js vendored

@ -82629,7 +82629,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

60
dist/bundle.css vendored

@ -4664,44 +4664,64 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-farbtastic .wheel { .bi-farbtastic .wheel {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/wheel.png') no-repeat center center; background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/wheel.png') no-repeat center center;

1
dist/bundle.ie.js vendored

@ -82225,7 +82225,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

1
dist/bundle.js vendored

@ -82629,7 +82629,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

60
dist/fineui.css vendored

@ -4664,44 +4664,64 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-farbtastic .wheel { .bi-farbtastic .wheel {
background: url('resources?path=/com/fr/web/ui/images/1x/background/wheel.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/1x/background/wheel.png') no-repeat center center;

1
dist/fineui.ie.js vendored

@ -82470,7 +82470,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

1
dist/fineui.js vendored

@ -82874,7 +82874,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

1
dist/fineui_without_jquery_polyfill.js vendored

@ -65480,7 +65480,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

60
dist/resource.css vendored

@ -30,44 +30,64 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-farbtastic .wheel { .bi-farbtastic .wheel {
background: url('images/1x/background/wheel.png') no-repeat center center; background: url('images/1x/background/wheel.png') no-repeat center center;

1
dist/widget.js vendored

@ -20295,7 +20295,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

60
public/css/app.css

@ -30,42 +30,62 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }

60
src/css/resource/app.css

@ -30,42 +30,62 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }

4
src/less/lib/constant.less

@ -102,7 +102,9 @@
@border-color-disabled-theme-dark: #606479; @border-color-disabled-theme-dark: #606479;
//scroll color //scroll color
@scroll-color: #20263b; @scroll-color: #232e40;
@scroll-color-theme-dark: #ffffff; @scroll-color-theme-dark: #ffffff;
@scroll-thumb-color: #232e40;
@scroll-thumb-color-theme-dark: #232e40;
@water-mark-color-theme-dark: #878d9f; @water-mark-color-theme-dark: #878d9f;

34
src/less/resource/app.less

@ -29,15 +29,27 @@ body {
div, textarea { div, textarea {
&::-webkit-scrollbar { &::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
width: 10px;
height: 10px;
}
&::-webkit-scrollbar-track {
width: 10px;
height: 10px;
.border-radius(5px);
.background-color(@scroll-color, 5%);
&:hover {
.background-color(@scroll-color, 5%); .background-color(@scroll-color, 5%);
width: 6px; }
height: 6px;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
.border-radius(0); width: 6px;
.background-color(@scroll-color, 30%); height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
.border-radius(10px);
.background-color(@scroll-color, 10%);
&:hover { &:hover {
.background-color(@scroll-color, 70%); .background-color(@scroll-color, 30%);
} }
} }
} }
@ -46,15 +58,17 @@ div, textarea {
div, textarea { div, textarea {
&::-webkit-scrollbar { &::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
&::-webkit-scrollbar-track {
.background-color(@scroll-color-theme-dark, 5%); .background-color(@scroll-color-theme-dark, 5%);
width: 6px; &:hover {
height: 6px; .background-color(@scroll-color-theme-dark, 5%);
}
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
.border-radius(0); .background-color(@scroll-color-theme-dark, 10%);
.background-color(@scroll-color-theme-dark, 30%);
&:hover { &:hover {
.background-color(@scroll-color-theme-dark, 70%); .background-color(@scroll-color-theme-dark, 30%);
} }
} }
} }

1
src/widget/singleslider/singleslider.js

@ -157,7 +157,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
} }
}, function () { }, function () {
if (startDrag === true) { if (startDrag === true) {

60
ui/css/app.css

@ -30,42 +30,62 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(32, 38, 59, 0.05); width: 10px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); height: 10px;
width: 6px; }
height: 6px; div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
}
div::-webkit-scrollbar-track:hover,
textarea::-webkit-scrollbar-track:hover {
background-color: rgba(35, 46, 64, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40);
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb { textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; width: 6px;
-moz-border-radius: 0; height: 6px;
border-radius: 0; border: 2px solid transparent;
background-color: rgba(32, 38, 59, 0.3); background-clip: padding-box;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); -webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: rgba(35, 46, 64, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(32, 38, 59, 0.7); background-color: rgba(35, 46, 64, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
}
.bi-theme-dark div::-webkit-scrollbar-track,
.bi-theme-dark textarea::-webkit-scrollbar-track {
background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
}
.bi-theme-dark div::-webkit-scrollbar-track:hover,
.bi-theme-dark textarea::-webkit-scrollbar-track:hover {
background-color: rgba(255, 255, 255, 0.05); background-color: rgba(255, 255, 255, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
width: 6px;
height: 6px;
} }
.bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark div::-webkit-scrollbar-thumb,
.bi-theme-dark textarea::-webkit-scrollbar-thumb { .bi-theme-dark textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; background-color: rgba(255, 255, 255, 0.1);
-moz-border-radius: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff);
border-radius: 0;
background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }
.bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff);
} }

Loading…
Cancel
Save