fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
fc8d768718 2630a20932
commit
4615f1363b
16 changed files with 2248 additions and 2239 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      bi/base.css
  2. 9
      bi/sliders.js
  3. 9
      dist/base.css
  4. 9
      dist/bundle.css
  5. 2
      dist/bundle.min.css
  6. 9
      dist/sliders.js
  7. 7
      src/addons/sliders/js/intervalslider/intervalslider.js
  8. 2
      src/addons/sliders/js/singleslider/singleslider.js
  9. 9
      src/css/base/single/input/input.css
  10. 2
      src/less/base/single/input/input.less

9
bi/base.css
Unescape View File

@ -884,7 +884,8 @@ li.CodeMirror-hint-active {
filter: alpha(opacity=0);
z-index: 2;
}
.bi-input {
.bi-input,
.bi-textarea {
border: none;
outline: none;
background-color: transparent;
@ -893,10 +894,12 @@ li.CodeMirror-hint-active {
width: 100%;
height: 100%;
}
.bi-input.bi-input-focus {
.bi-input.bi-input-focus,
.bi-textarea.bi-input-focus {
border: none;
}
.bi-input.bi-input-error {
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #e85050 !important;
}

9
bi/sliders.js
Unescape View File

@ -6,7 +6,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
EDITOR_WIDTH: 58,
EDITOR_R_GAP: 60,
EDITOR_HEIGHT: 30,
HEIGHT: 28,
SLIDER_WIDTH_HALF: 15,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
@ -51,7 +50,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
cls: "slider-editor-button",
errorText: "",
allowBlank: false,
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
validationChecker: function (v) {
return self._checkValidation(v);
@ -78,7 +76,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
cls: "slider-editor-button",
errorText: "",
allowBlank: false,
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
validationChecker: function (v) {
return self._checkValidation(v);
@ -122,6 +119,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setSliderOnePosition(significantPercent);
self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
ui.helper.removeClass("dragging");
},
start: function (e, ui) {
ui.helper.removeClass("dragging").addClass("dragging");
}
});
@ -1183,7 +1184,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_constant: {
EDITOR_WIDTH: 90,
EDITOR_HEIGHT: 30,
HEIGHT: 28,
SLIDER_WIDTH_HALF: 15,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
@ -1276,7 +1276,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
type: "bi.sign_editor",
cls: "slider-editor-button",
errorText: "",
height: c.HEIGHT,
width: c.EDITOR_WIDTH - 2,
allowBlank: false,
validationChecker: function (v) {

9
dist/base.css vendored
Unescape View File

@ -884,7 +884,8 @@ li.CodeMirror-hint-active {
filter: alpha(opacity=0);
z-index: 2;
}
.bi-input {
.bi-input,
.bi-textarea {
border: none;
outline: none;
background-color: transparent;
@ -893,10 +894,12 @@ li.CodeMirror-hint-active {
width: 100%;
height: 100%;
}
.bi-input.bi-input-focus {
.bi-input.bi-input-focus,
.bi-textarea.bi-input-focus {
border: none;
}
.bi-input.bi-input-error {
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #e85050 !important;
}

9
dist/bundle.css vendored
Unescape View File

@ -2463,7 +2463,8 @@ li.CodeMirror-hint-active {
filter: alpha(opacity=0);
z-index: 2;
}
.bi-input {
.bi-input,
.bi-textarea {
border: none;
outline: none;
background-color: transparent;
@ -2472,10 +2473,12 @@ li.CodeMirror-hint-active {
width: 100%;
height: 100%;
}
.bi-input.bi-input-focus {
.bi-input.bi-input-focus,
.bi-textarea.bi-input-focus {
border: none;
}
.bi-input.bi-input-error {
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #e85050 !important;
}

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
dist/sliders.js vendored
Unescape View File

@ -6,7 +6,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
EDITOR_WIDTH: 58,
EDITOR_R_GAP: 60,
EDITOR_HEIGHT: 30,
HEIGHT: 28,
SLIDER_WIDTH_HALF: 15,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
@ -51,7 +50,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
cls: "slider-editor-button",
errorText: "",
allowBlank: false,
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
validationChecker: function (v) {
return self._checkValidation(v);
@ -78,7 +76,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
cls: "slider-editor-button",
errorText: "",
allowBlank: false,
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
validationChecker: function (v) {
return self._checkValidation(v);
@ -122,6 +119,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setSliderOnePosition(significantPercent);
self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
ui.helper.removeClass("dragging");
},
start: function (e, ui) {
ui.helper.removeClass("dragging").addClass("dragging");
}
});
@ -1183,7 +1184,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_constant: {
EDITOR_WIDTH: 90,
EDITOR_HEIGHT: 30,
HEIGHT: 28,
SLIDER_WIDTH_HALF: 15,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
@ -1276,7 +1276,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
type: "bi.sign_editor",
cls: "slider-editor-button",
errorText: "",
height: c.HEIGHT,
width: c.EDITOR_WIDTH - 2,
allowBlank: false,
validationChecker: function (v) {

7
src/addons/sliders/js/intervalslider/intervalslider.js
Unescape View File

@ -6,7 +6,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
EDITOR_WIDTH: 58,
EDITOR_R_GAP: 60,
EDITOR_HEIGHT: 30,
HEIGHT: 28,
SLIDER_WIDTH_HALF: 15,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
@ -51,7 +50,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
cls: "slider-editor-button",
errorText: "",
allowBlank: false,
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
validationChecker: function (v) {
return self._checkValidation(v);
@ -78,7 +76,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
cls: "slider-editor-button",
errorText: "",
allowBlank: false,
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
validationChecker: function (v) {
return self._checkValidation(v);
@ -122,6 +119,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setSliderOnePosition(significantPercent);
self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
ui.helper.removeClass("dragging");
},
start: function (e, ui) {
ui.helper.removeClass("dragging").addClass("dragging");
}
});

2
src/addons/sliders/js/singleslider/singleslider.js
Unescape View File

@ -5,7 +5,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_constant: {
EDITOR_WIDTH: 90,
EDITOR_HEIGHT: 30,
HEIGHT: 28,
SLIDER_WIDTH_HALF: 15,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
@ -98,7 +97,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
type: "bi.sign_editor",
cls: "slider-editor-button",
errorText: "",
height: c.HEIGHT,
width: c.EDITOR_WIDTH - 2,
allowBlank: false,
validationChecker: function (v) {

9
src/css/base/single/input/input.css
Unescape View File

@ -1,4 +1,5 @@
.bi-input {
.bi-input,
.bi-textarea {
border: none;
outline: none;
background-color: transparent;
@ -7,10 +8,12 @@
width: 100%;
height: 100%;
}
.bi-input.bi-input-focus {
.bi-input.bi-input-focus,
.bi-textarea.bi-input-focus {
border: none;
}
.bi-input.bi-input-error {
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #e85050 !important;
}

2
src/less/base/single/input/input.less
Unescape View File

@ -1,6 +1,6 @@
@import "../../../bibase";
.bi-input{
.bi-input, .bi-textarea{
border: none;
outline: none;
background-color: transparent;

Write Preview
Loading…
Cancel
Save