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

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

* commit '88ecbcf7afd521220d25e3b72d098a153da4d462':
  无JIRA任务 disabled背景没有给，补一下
  update
es6
Young 7 years ago
parent
74b551b1ae 88ecbcf7af
commit
e84a33e446
28 changed files with 295 additions and 184 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. 38
      dist/_fineui.min.js
  2. 22
      dist/base.css
  3. 68
      dist/bundle.css
  4. 3
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 30
      dist/bundle.min.js
  7. 33
      dist/core.css
  8. 33
      dist/core_without_normalize.css
  9. 68
      dist/fineui.css
  10. 3
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 38
      dist/fineui.min.js
  13. 12
      dist/resource.css
  14. 1
      dist/widget.css
  15. 3
      dist/widget.js
  16. 12
      public/css/app.css
  17. 6
      src/css/base/single/button/button.css
  18. 16
      src/css/base/table/table.css
  19. 31
      src/css/core/utils/common.css
  20. 12
      src/css/resource/app.css
  21. 2
      src/css/theme/dark.css
  22. 1
      src/css/widget/singleslider/slider/widget.css
  23. 2
      src/less/base/single/button/button.less
  24. 17
      src/less/core/utils/common.less
  25. 8
      src/less/lib/constant.less
  26. 1
      src/less/widget/singleslider/slider/widget.slider.less
  27. 3
      src/widget/singleslider/button/iconbutton.slider.js
  28. 12
      ui/css/app.css

38
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
dist/base.css vendored
Unescape View File

@ -981,8 +981,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #cccccc !important;
border-color: #cccccc !important;
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -1016,7 +1016,7 @@ body .bi-button.button-error.disabled.base-disabled .b-font:before,
#body .bi-button.button-error.disabled.base-disabled .b-font:before,
body .bi-button.button-warning.disabled.base-disabled .b-font:before,
#body .bi-button.button-warning.disabled.base-disabled .b-font:before {
color: #ffffff !important;
color: #9ea6b2 !important;
}
body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled {
@ -1441,8 +1441,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -1464,8 +1464,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d666666,endColorstr=#0d666666);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -1522,8 +1522,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d666666,endColorstr=#4d666666);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -1534,8 +1534,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.horizontal-scrollbar {
bottom: 0;

68
dist/bundle.css vendored
Unescape View File

@ -336,13 +336,13 @@ textarea {
}
.bi-theme-dark .bi-background {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-card {
background-color: #ffffff;
@ -356,13 +356,13 @@ textarea {
}
.bi-theme-dark .bi-card {
background-color: #242640;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-disabled {
color: #9ea6b2;
@ -1105,7 +1105,24 @@ textarea {
.bi-list-item-select.disabled.bi-high-light-border,
.bi-list-item-select.disabled:hover.bi-high-light-border,
.bi-list-item-select.disabled:active.bi-high-light-border {
border-color: #cccccc;
border-color: #F0F3F7;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
background-color: #f7f8fa;
}
.bi-list-item-select2:active,
.bi-list-item-select2.active {
color: #3685f2;
background-color: #f7f8fa;
}
.bi-list-item-select2:active .bi-input,
.bi-list-item-select2.active .bi-input {
color: #3685f2;
}
.bi-list-item-select2:active .bi-textarea,
.bi-list-item-select2.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
@ -1749,7 +1766,7 @@ textarea {
}
.bi-theme-dark {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-input {
color: #ffffff;
@ -2737,8 +2754,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #cccccc !important;
border-color: #cccccc !important;
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -2772,7 +2789,7 @@ body .bi-button.button-error.disabled.base-disabled .b-font:before,
#body .bi-button.button-error.disabled.base-disabled .b-font:before,
body .bi-button.button-warning.disabled.base-disabled .b-font:before,
#body .bi-button.button-warning.disabled.base-disabled .b-font:before {
color: #ffffff !important;
color: #9ea6b2 !important;
}
body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled {
@ -3197,8 +3214,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -3220,8 +3237,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d666666,endColorstr=#0d666666);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -3278,8 +3295,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d666666,endColorstr=#4d666666);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -3290,8 +3307,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.horizontal-scrollbar {
bottom: 0;
@ -4132,6 +4149,7 @@ ul.ztree.zTreeDragUL {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: #f7f8fa;
width: 20px;
height: 20px;
top: 4px;
@ -4250,8 +4268,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
width: 6px;
height: 6px;
}
@ -4260,13 +4278,13 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.farbtastic .wheel {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/wheel.png') no-repeat center center;

3
dist/bundle.js vendored
Unescape View File

@ -108565,7 +108565,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.text_button",
cls: "slider-button",
forceNotSelected: true,
cls: "slider-button bi-list-item-select2",
ref: function () {
self.slider = this;
}

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

30
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

33
dist/core.css vendored
Unescape View File

@ -336,13 +336,13 @@ textarea {
}
.bi-theme-dark .bi-background {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-card {
background-color: #ffffff;
@ -356,13 +356,13 @@ textarea {
}
.bi-theme-dark .bi-card {
background-color: #242640;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-disabled {
color: #9ea6b2;
@ -1105,7 +1105,24 @@ textarea {
.bi-list-item-select.disabled.bi-high-light-border,
.bi-list-item-select.disabled:hover.bi-high-light-border,
.bi-list-item-select.disabled:active.bi-high-light-border {
border-color: #cccccc;
border-color: #F0F3F7;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
background-color: #f7f8fa;
}
.bi-list-item-select2:active,
.bi-list-item-select2.active {
color: #3685f2;
background-color: #f7f8fa;
}
.bi-list-item-select2:active .bi-input,
.bi-list-item-select2.active .bi-input {
color: #3685f2;
}
.bi-list-item-select2:active .bi-textarea,
.bi-list-item-select2.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
@ -1749,7 +1766,7 @@ textarea {
}
.bi-theme-dark {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-input {
color: #ffffff;

33
dist/core_without_normalize.css vendored
Unescape View File

@ -58,13 +58,13 @@ textarea {
}
.bi-theme-dark .bi-background {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-card {
background-color: #ffffff;
@ -78,13 +78,13 @@ textarea {
}
.bi-theme-dark .bi-card {
background-color: #242640;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-disabled {
color: #9ea6b2;
@ -827,7 +827,24 @@ textarea {
.bi-list-item-select.disabled.bi-high-light-border,
.bi-list-item-select.disabled:hover.bi-high-light-border,
.bi-list-item-select.disabled:active.bi-high-light-border {
border-color: #cccccc;
border-color: #F0F3F7;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
background-color: #f7f8fa;
}
.bi-list-item-select2:active,
.bi-list-item-select2.active {
color: #3685f2;
background-color: #f7f8fa;
}
.bi-list-item-select2:active .bi-input,
.bi-list-item-select2.active .bi-input {
color: #3685f2;
}
.bi-list-item-select2:active .bi-textarea,
.bi-list-item-select2.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
@ -1471,7 +1488,7 @@ textarea {
}
.bi-theme-dark {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-input {
color: #ffffff;

68
dist/fineui.css vendored
Unescape View File

@ -336,13 +336,13 @@ textarea {
}
.bi-theme-dark .bi-background {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-card {
background-color: #ffffff;
@ -356,13 +356,13 @@ textarea {
}
.bi-theme-dark .bi-card {
background-color: #242640;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-disabled {
color: #9ea6b2;
@ -1105,7 +1105,24 @@ textarea {
.bi-list-item-select.disabled.bi-high-light-border,
.bi-list-item-select.disabled:hover.bi-high-light-border,
.bi-list-item-select.disabled:active.bi-high-light-border {
border-color: #cccccc;
border-color: #F0F3F7;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
background-color: #f7f8fa;
}
.bi-list-item-select2:active,
.bi-list-item-select2.active {
color: #3685f2;
background-color: #f7f8fa;
}
.bi-list-item-select2:active .bi-input,
.bi-list-item-select2.active .bi-input {
color: #3685f2;
}
.bi-list-item-select2:active .bi-textarea,
.bi-list-item-select2.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {
@ -1749,7 +1766,7 @@ textarea {
}
.bi-theme-dark {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-input {
color: #ffffff;
@ -2737,8 +2754,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #cccccc !important;
border-color: #cccccc !important;
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -2772,7 +2789,7 @@ body .bi-button.button-error.disabled.base-disabled .b-font:before,
#body .bi-button.button-error.disabled.base-disabled .b-font:before,
body .bi-button.button-warning.disabled.base-disabled .b-font:before,
#body .bi-button.button-warning.disabled.base-disabled .b-font:before {
color: #ffffff !important;
color: #9ea6b2 !important;
}
body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled {
@ -3197,8 +3214,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -3220,8 +3237,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d666666,endColorstr=#0d666666);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -3278,8 +3295,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d666666,endColorstr=#4d666666);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -3290,8 +3307,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.horizontal-scrollbar {
bottom: 0;
@ -4132,6 +4149,7 @@ ul.ztree.zTreeDragUL {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: #f7f8fa;
width: 20px;
height: 20px;
top: 4px;
@ -4250,8 +4268,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
width: 6px;
height: 6px;
}
@ -4260,13 +4278,13 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.farbtastic .wheel {
background: url('resources?path=/com/fr/web/ui/images/1x/background/wheel.png') no-repeat center center;

3
dist/fineui.js vendored
Unescape View File

@ -108814,7 +108814,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.text_button",
cls: "slider-button",
forceNotSelected: true,
cls: "slider-button bi-list-item-select2",
ref: function () {
self.slider = this;
}

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

38
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/resource.css vendored
Unescape View File

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
width: 6px;
height: 6px;
}
@ -61,13 +61,13 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.farbtastic .wheel {
background: url('images/1x/background/wheel.png') no-repeat center center;

1
dist/widget.css vendored
Unescape View File

@ -427,6 +427,7 @@
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: #f7f8fa;
width: 20px;
height: 20px;
top: 4px;

3
dist/widget.js vendored
Unescape View File

@ -20891,7 +20891,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.text_button",
cls: "slider-button",
forceNotSelected: true,
cls: "slider-button bi-list-item-select2",
ref: function () {
self.slider = this;
}

12
public/css/app.css
Unescape View File

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
width: 6px;
height: 6px;
}
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}

6
src/css/base/single/button/button.css
Unescape View File

@ -163,8 +163,8 @@ body .bi-button.button-error.disabled.base-disabled,
#body .bi-button.button-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled,
#body .bi-button.button-warning.disabled.base-disabled {
background: #cccccc !important;
border-color: #cccccc !important;
background: #F0F3F7 !important;
border-color: #F0F3F7 !important;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -198,7 +198,7 @@ body .bi-button.button-error.disabled.base-disabled .b-font:before,
#body .bi-button.button-error.disabled.base-disabled .b-font:before,
body .bi-button.button-warning.disabled.base-disabled .b-font:before,
#body .bi-button.button-warning.disabled.base-disabled .b-font:before {
color: #ffffff !important;
color: #9ea6b2 !important;
}
body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled {

16
src/css/base/table/table.css
Unescape View File

@ -63,8 +63,8 @@
border-radius: 5px;
}
.bi-theme-dark .scrollbar-layout-main {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
.scrollbar-layout-main-vertical {
bottom: 0;
@ -86,8 +86,8 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d666666,endColorstr=#0d666666);
}
.bi-theme-dark .scrollbar-layout-main-horizontal {
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
}
/* Touching the scroll-track directly makes the scroll-track bolder */
.scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@ -144,8 +144,8 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d666666,endColorstr=#4d666666);
}
.bi-theme-dark .public-scrollbar-face:after {
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.public-scrollbar-main:hover .public-scrollbar-face:after,
.public-scrollbar-main-active .public-scrollbar-face:after,
@ -156,8 +156,8 @@
.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
.bi-theme-dark .public-scrollbar-face-active:after {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}
.horizontal-scrollbar {
bottom: 0;

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

@ -58,13 +58,13 @@ textarea {
}
.bi-theme-dark .bi-background {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-background .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-card {
background-color: #ffffff;
@ -78,13 +78,13 @@ textarea {
}
.bi-theme-dark .bi-card {
background-color: #242640;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-input {
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-card .bi-textarea {
color: #cccccc;
color: #F0F3F7;
}
.bi-disabled {
color: #9ea6b2;
@ -827,7 +827,24 @@ textarea {
.bi-list-item-select.disabled.bi-high-light-border,
.bi-list-item-select.disabled:hover.bi-high-light-border,
.bi-list-item-select.disabled:active.bi-high-light-border {
border-color: #cccccc;
border-color: #F0F3F7;
}
.bi-list-item-select2:hover,
.bi-list-item-select2.hover {
background-color: #f7f8fa;
}
.bi-list-item-select2:active,
.bi-list-item-select2.active {
color: #3685f2;
background-color: #f7f8fa;
}
.bi-list-item-select2:active .bi-input,
.bi-list-item-select2.active .bi-input {
color: #3685f2;
}
.bi-list-item-select2:active .bi-textarea,
.bi-list-item-select2.active .bi-textarea {
color: #3685f2;
}
.bi-theme-dark .bi-list-item-select:hover,
.bi-theme-dark .bi-list-item-select.hover {

12
src/css/resource/app.css
Unescape View File

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
width: 6px;
height: 6px;
}
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}

2
src/css/theme/dark.css
Unescape View File

@ -1,6 +1,6 @@
.bi-theme-dark {
background-color: #191B2B;
color: #cccccc;
color: #F0F3F7;
}
.bi-theme-dark .bi-input {
color: #ffffff;

1
src/css/widget/singleslider/slider/widget.css
Unescape View File

@ -15,6 +15,7 @@
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: #f7f8fa;
width: 20px;
height: 20px;
top: 4px;

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

@ -114,7 +114,7 @@ body .bi-button, #body .bi-button {
&.button-warning.disabled {
&, &.base-disabled {
&, & .b-font:before {
color: @color-bi-text !important;
color: @color-bi-text-disabled !important;
}
background: @color-bi-background-disabled !important;
border-color: @color-bi-border-disabled !important;

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

@ -812,6 +812,23 @@ textarea {
}
}
//与bi-list-item-select的区别是背景是灰的
.bi-list-item-select2 {
&:hover, &.hover {
background-color: @color-bi-background-normal;
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-normal;
}
}
.bi-theme-dark {
.bi-list-item-select {
&:hover, &.hover {

8
src/less/lib/constant.less
Unescape View File

@ -17,7 +17,7 @@
//font color
@font-color-black: #232e40;//
@font-color-normal: #3d4d66;//
@font-color-normal-theme-dark: #cccccc;//
@font-color-normal-theme-dark: #F0F3F7;//
@font-color-light-gray: #647185;
@font-color-disabled: #9ea6b2;//
@font-color-disabled-theme-dark: #666666;//
@ -48,7 +48,7 @@
@background-color-dark: #d4dadd;
@background-color-light-gray: #F2F4F7;
@background-color-dark-gray: #d0d4da;
@background-color-disabled: #cccccc;
@background-color-disabled: #F0F3F7;
@background-color-yellow: #ffc101;//
@background-color-negative: #ff4949;
@ -75,10 +75,10 @@
@border-color-normal-success: #eddea2;
//split color
@border-color-disabled: #cccccc;
@border-color-disabled: #F0F3F7;
//scroll color
@scroll-color: #666666;
@scroll-color-theme-dark: #cccccc;
@scroll-color-theme-dark: #F0F3F7;
@water-mark-color-theme-dark: #666666;

1
src/less/widget/singleslider/slider/widget.slider.less
Unescape View File

@ -12,6 +12,7 @@
left: -8px;
&:hover, &.hover {
.border-radius(10px);
background-color: @color-bi-background-normal;
width: 20px;
height: 20px;
top: 4px;

3
src/widget/singleslider/button/iconbutton.slider.js
Unescape View File

@ -24,7 +24,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.text_button",
cls: "slider-button",
forceNotSelected: true,
cls: "slider-button bi-list-item-select2",
ref: function () {
self.slider = this;
}

12
ui/css/app.css
Unescape View File

@ -51,8 +51,8 @@ textarea::-webkit-scrollbar-thumb:hover {
.bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar {
-webkit-appearance: none;
background-color: rgba(204, 204, 204, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc);
background-color: rgba(240, 243, 247, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0df0f3f7,endColorstr=#0df0f3f7);
width: 6px;
height: 6px;
}
@ -61,11 +61,11 @@ textarea::-webkit-scrollbar-thumb:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: rgba(204, 204, 204, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc);
background-color: rgba(240, 243, 247, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4df0f3f7,endColorstr=#4df0f3f7);
}
.bi-theme-dark div::-webkit-scrollbar-thumb:hover,
.bi-theme-dark textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(204, 204, 204, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc);
background-color: rgba(240, 243, 247, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3f0f3f7,endColorstr=#b3f0f3f7);
}

Write Preview
Loading…
Cancel
Save