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

Merge pull request #874 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '7a5f076dae69126104c431e405c4079c4918991a':
  DEC-6957 fix: IE11下textarea输入回车不换行 && 视觉调整
es6
windy 6 years ago
parent
19675501c6 7a5f076dae
commit
cbd591ebd3
26 changed files with 51 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      dist/2.0/fineui.css
  2. 4
      dist/2.0/fineui.ie.js
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 4
      dist/2.0/fineui.js
  5. 4
      dist/2.0/fineui.min.js
  6. 3
      dist/base.css
  7. 4
      dist/base.js
  8. 3
      dist/bundle.css
  9. 4
      dist/bundle.ie.js
  10. 4
      dist/bundle.ie.min.js
  11. 4
      dist/bundle.js
  12. 4
      dist/bundle.min.js
  13. 3
      dist/fineui.css
  14. 4
      dist/fineui.ie.js
  15. 4
      dist/fineui.ie.min.js
  16. 4
      dist/fineui.js
  17. 4
      dist/fineui.min.js
  18. 4
      dist/fineui_without_jquery_polyfill.js
  19. 2
      dist/utils.min.js
  20. 4
      src/base/single/editor/editor.textarea.js
  21. 1
      src/css/base/single/editor/editor.css
  22. 1
      src/css/base/single/input/checkbox.css
  23. 1
      src/css/base/single/input/radio.css
  24. 1
      src/less/base/single/editor/editor.textarea.less
  25. 2
      src/less/base/single/input/checkbox.less
  26. 2
      src/less/base/single/input/radio.less

3
dist/2.0/fineui.css vendored
Unescape View File

@ -3525,6 +3525,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
overflow-y: hidden; overflow-y: hidden;
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
white-space: pre-wrap;
font-size: 12px; font-size: 12px;
line-height: 21px; line-height: 21px;
border: none; border: none;
@ -3569,6 +3570,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-context {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-context:after {
@ -3636,6 +3638,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {

4
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -44392,8 +44392,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

4
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.js vendored
Unescape View File

@ -44796,8 +44796,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

4
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.css vendored
Unescape View File

@ -1369,6 +1369,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
overflow-y: hidden; overflow-y: hidden;
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
white-space: pre-wrap;
font-size: 12px; font-size: 12px;
line-height: 21px; line-height: 21px;
border: none; border: none;
@ -1413,6 +1414,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-context {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-context:after {
@ -1480,6 +1482,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {

4
dist/base.js vendored
Unescape View File

@ -9007,8 +9007,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

3
dist/bundle.css vendored
Unescape View File

@ -3525,6 +3525,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
overflow-y: hidden; overflow-y: hidden;
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
white-space: pre-wrap;
font-size: 12px; font-size: 12px;
line-height: 21px; line-height: 21px;
border: none; border: none;
@ -3569,6 +3570,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-context {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-context:after {
@ -3636,6 +3638,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {

4
dist/bundle.ie.js vendored
Unescape View File

@ -44392,8 +44392,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

4
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored
Unescape View File

@ -44796,8 +44796,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

4
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/fineui.css vendored
Unescape View File

@ -3525,6 +3525,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
overflow-y: hidden; overflow-y: hidden;
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
white-space: pre-wrap;
font-size: 12px; font-size: 12px;
line-height: 21px; line-height: 21px;
border: none; border: none;
@ -3569,6 +3570,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-context {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-context:after {
@ -3636,6 +3638,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {

4
dist/fineui.ie.js vendored
Unescape View File

@ -44637,8 +44637,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored
Unescape View File

@ -45041,8 +45041,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -32572,8 +32572,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/base/single/editor/editor.textarea.js
Unescape View File

@ -96,8 +96,8 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 6, left: 10,
top: 0, top: 4,
right: 0 right: 0
}] }]
}); });

1
src/css/base/single/editor/editor.css
Unescape View File

@ -16,6 +16,7 @@
overflow-y: hidden; overflow-y: hidden;
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
white-space: pre-wrap;
font-size: 12px; font-size: 12px;
line-height: 21px; line-height: 21px;
border: none; border: none;

1
src/css/base/single/input/checkbox.css
Unescape View File

@ -34,6 +34,7 @@
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-context {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-context:after {

1
src/css/base/single/input/radio.css
Unescape View File

@ -33,6 +33,7 @@
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {

1
src/less/base/single/editor/editor.textarea.less
Unescape View File

@ -3,6 +3,7 @@
.bi-textarea-editor { .bi-textarea-editor {
.overflow-hidden(); .overflow-hidden();
& .textarea-editor-content { & .textarea-editor-content {
white-space: pre-wrap;
font-size: @font-size-12; font-size: @font-size-12;
line-height: 21px; line-height: 21px;
& { & {

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

@ -33,6 +33,8 @@
} }
&.active { &.active {
& .checkbox-context { & .checkbox-context {
// 深浅主题下border-color是一样的
border-color: @color-bi-border-line;
background-color: @color-bi-background-dark-gray; background-color: @color-bi-background-dark-gray;
&:after { &:after {
opacity: 1; opacity: 1;

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

@ -30,6 +30,8 @@
} }
&.active { &.active {
& .radio-content { & .radio-content {
// 深浅主题下border-color是一样的
border-color: @color-bi-border-line;
background-color: @color-bi-background-dark-gray; background-color: @color-bi-background-dark-gray;
&:after { &:after {
background-color: @color-bi-background-default; background-color: @color-bi-background-default;

Write Preview
Loading…
Cancel
Save