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

Merge pull request #1137 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master 

* commit '02daf00b36d020d81602890f2b11047660c9116c':
  BI-51799 refactor: 根据comment优化代码
  无JIRA任务 refactor: bi-list-item-select2深色背景悬停状态多了背景色
es6
windy 5 years ago
parent
c667a128ac 02daf00b36
commit
b2ace04760
17 changed files with 70 additions and 142 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. 13
      dist/2.0/fineui.css
  2. 22
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.min.css
  4. 24
      dist/2.0/fineui.min.js
  5. 13
      dist/bundle.css
  6. 22
      dist/bundle.ie.min.js
  7. 2
      dist/bundle.min.css
  8. 24
      dist/bundle.min.js
  9. 13
      dist/core.css
  10. 13
      dist/core_without_normalize.css
  11. 13
      dist/fineui.css
  12. 12
      dist/fineui.ie.min.js
  13. 2
      dist/fineui.min.css
  14. 10
      dist/fineui.min.js
  15. 2
      dist/utils.min.js
  16. 13
      src/css/core/utils/common.css
  17. 12
      src/less/core/utils/common.less

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

@ -1319,7 +1319,6 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; color: #ffffff;
background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2:hover .bi-input,
.bi-theme-dark .bi-list-item-select2.hover .bi-input { .bi-theme-dark .bi-list-item-select2.hover .bi-input {
@ -1329,19 +1328,9 @@ textarea {
.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { .bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2.active {
.bi-theme-dark .bi-list-item-select2:active {
color: #3685f2;
background-color: #20263b; background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2.active .bi-input,
.bi-theme-dark .bi-list-item-select2:active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.disabled, .bi-theme-dark .bi-list-item-select2.disabled,
.bi-theme-dark .bi-list-item-select2.disabled:hover, .bi-theme-dark .bi-list-item-select2.disabled:hover,
.bi-theme-dark .bi-list-item-select2.disabled:active { .bi-theme-dark .bi-list-item-select2.disabled:active {

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

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

13
dist/bundle.css vendored
Unescape View File

@ -1319,7 +1319,6 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; color: #ffffff;
background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2:hover .bi-input,
.bi-theme-dark .bi-list-item-select2.hover .bi-input { .bi-theme-dark .bi-list-item-select2.hover .bi-input {
@ -1329,19 +1328,9 @@ textarea {
.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { .bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2.active {
.bi-theme-dark .bi-list-item-select2:active {
color: #3685f2;
background-color: #20263b; background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2.active .bi-input,
.bi-theme-dark .bi-list-item-select2:active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.disabled, .bi-theme-dark .bi-list-item-select2.disabled,
.bi-theme-dark .bi-list-item-select2.disabled:hover, .bi-theme-dark .bi-list-item-select2.disabled:hover,
.bi-theme-dark .bi-list-item-select2.disabled:active { .bi-theme-dark .bi-list-item-select2.disabled:active {

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

File diff suppressed because one or more lines are too long

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
dist/core.css vendored
Unescape View File

@ -1319,7 +1319,6 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; color: #ffffff;
background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2:hover .bi-input,
.bi-theme-dark .bi-list-item-select2.hover .bi-input { .bi-theme-dark .bi-list-item-select2.hover .bi-input {
@ -1329,19 +1328,9 @@ textarea {
.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { .bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2.active {
.bi-theme-dark .bi-list-item-select2:active {
color: #3685f2;
background-color: #20263b; background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2.active .bi-input,
.bi-theme-dark .bi-list-item-select2:active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.disabled, .bi-theme-dark .bi-list-item-select2.disabled,
.bi-theme-dark .bi-list-item-select2.disabled:hover, .bi-theme-dark .bi-list-item-select2.disabled:hover,
.bi-theme-dark .bi-list-item-select2.disabled:active { .bi-theme-dark .bi-list-item-select2.disabled:active {

13
dist/core_without_normalize.css vendored
Unescape View File

@ -1039,7 +1039,6 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; color: #ffffff;
background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2:hover .bi-input,
.bi-theme-dark .bi-list-item-select2.hover .bi-input { .bi-theme-dark .bi-list-item-select2.hover .bi-input {
@ -1049,19 +1048,9 @@ textarea {
.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { .bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2.active {
.bi-theme-dark .bi-list-item-select2:active {
color: #3685f2;
background-color: #20263b; background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2.active .bi-input,
.bi-theme-dark .bi-list-item-select2:active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.disabled, .bi-theme-dark .bi-list-item-select2.disabled,
.bi-theme-dark .bi-list-item-select2.disabled:hover, .bi-theme-dark .bi-list-item-select2.disabled:hover,
.bi-theme-dark .bi-list-item-select2.disabled:active { .bi-theme-dark .bi-list-item-select2.disabled:active {

13
dist/fineui.css vendored
Unescape View File

@ -1319,7 +1319,6 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; color: #ffffff;
background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2:hover .bi-input,
.bi-theme-dark .bi-list-item-select2.hover .bi-input { .bi-theme-dark .bi-list-item-select2.hover .bi-input {
@ -1329,19 +1328,9 @@ textarea {
.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { .bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2.active {
.bi-theme-dark .bi-list-item-select2:active {
color: #3685f2;
background-color: #20263b; background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2.active .bi-input,
.bi-theme-dark .bi-list-item-select2:active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.disabled, .bi-theme-dark .bi-list-item-select2.disabled,
.bi-theme-dark .bi-list-item-select2.disabled:hover, .bi-theme-dark .bi-list-item-select2.disabled:hover,
.bi-theme-dark .bi-list-item-select2.disabled:active { .bi-theme-dark .bi-list-item-select2.disabled:active {

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

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
src/css/core/utils/common.css
Unescape View File

@ -991,7 +991,6 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; color: #ffffff;
background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2:hover .bi-input,
.bi-theme-dark .bi-list-item-select2.hover .bi-input { .bi-theme-dark .bi-list-item-select2.hover .bi-input {
@ -1001,19 +1000,9 @@ textarea {
.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { .bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2.active {
.bi-theme-dark .bi-list-item-select2:active {
color: #3685f2;
background-color: #20263b; background-color: #20263b;
} }
.bi-theme-dark .bi-list-item-select2.active .bi-input,
.bi-theme-dark .bi-list-item-select2:active .bi-input {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select2.disabled, .bi-theme-dark .bi-list-item-select2.disabled,
.bi-theme-dark .bi-list-item-select2.disabled:hover, .bi-theme-dark .bi-list-item-select2.disabled:hover,
.bi-theme-dark .bi-list-item-select2.disabled:active { .bi-theme-dark .bi-list-item-select2.disabled:active {

12
src/less/core/utils/common.less
Unescape View File

@ -1022,18 +1022,12 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text; color: @color-bi-text;
} }
background-color: @color-bi-background-default-theme-dark;
} }
&.active, &:active {
color: @color-bi-text-highlight; &.active {
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-default-theme-dark; background-color: @color-bi-background-default-theme-dark;
} }
&.disabled { &.disabled {
&, &:hover, &:active { &, &:hover, &:active {
background-color: transparent !important; background-color: transparent !important;

Write Preview
Loading…
Cancel
Save