Browse Source

DEC-6878 fix: disabled状态下的样式改了 && 还原common.less

master
windy 6 years ago
parent
commit
344752eb82
  1. 25
      dist/2.0/fineui.css
  2. 2
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.min.css
  4. 2
      dist/2.0/fineui.min.js
  5. 15
      dist/base.css
  6. 25
      dist/bundle.css
  7. 2
      dist/bundle.ie.min.js
  8. 2
      dist/bundle.min.css
  9. 2
      dist/bundle.min.js
  10. 10
      dist/core.css
  11. 10
      dist/core_without_normalize.css
  12. 25
      dist/fineui.css
  13. 2
      dist/fineui.ie.min.js
  14. 2
      dist/fineui.min.css
  15. 2
      dist/fineui.min.js
  16. 2
      dist/utils.min.js
  17. 6
      src/css/base/single/input/checkbox.css
  18. 9
      src/css/base/single/input/radio.css
  19. 10
      src/css/core/utils/common.css
  20. 8
      src/less/base/single/input/checkbox.less
  21. 12
      src/less/base/single/input/radio.less
  22. 10
      src/less/core/utils/common.less

25
dist/2.0/fineui.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -3430,6 +3420,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-context:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file { .bi-file {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@ -3480,10 +3476,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.bi-radio.disabled:active .radio-content:after, .bi-radio.disabled .radio-content:after {
.bi-radio.disabled.active .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label { .bi-label {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow-x: hidden; overflow-x: hidden;

2
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

15
dist/base.css vendored

@ -1407,6 +1407,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-context:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file { .bi-file {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@ -1457,10 +1463,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.bi-radio.disabled:active .radio-content:after, .bi-radio.disabled .radio-content:after {
.bi-radio.disabled.active .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label { .bi-label {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow-x: hidden; overflow-x: hidden;

25
dist/bundle.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -3430,6 +3420,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-context:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file { .bi-file {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@ -3480,10 +3476,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.bi-radio.disabled:active .radio-content:after, .bi-radio.disabled .radio-content:after {
.bi-radio.disabled.active .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label { .bi-label {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow-x: hidden; overflow-x: hidden;

2
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/core.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;

10
dist/core_without_normalize.css vendored

@ -282,16 +282,6 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;

25
dist/fineui.css vendored

@ -563,16 +563,6 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -3430,6 +3420,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-context:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}
.bi-file { .bi-file {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@ -3480,10 +3476,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.bi-radio.disabled:active .radio-content:after, .bi-radio.disabled .radio-content:after {
.bi-radio.disabled.active .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}
.bi-label { .bi-label {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow-x: hidden; overflow-x: hidden;

2
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

6
src/css/base/single/input/checkbox.css

@ -28,3 +28,9 @@
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-context:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context {
background-color: #d0d4da;
}
.bi-checkbox.disabled.active .checkbox-context:after {
opacity: 1;
}

9
src/css/base/single/input/radio.css

@ -24,7 +24,12 @@
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.bi-radio.disabled:active .radio-content:after, .bi-radio.disabled .radio-content:after {
.bi-radio.disabled.active .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content {
background-color: #d0d4da;
}
.bi-radio.disabled.active .radio-content:after {
background-color: #ffffff;
}

10
src/css/core/utils/common.css

@ -282,16 +282,6 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;

8
src/less/base/single/input/checkbox.less

@ -27,5 +27,13 @@
& .checkbox-context:after { & .checkbox-context:after {
opacity: 0; opacity: 0;
} }
&.active {
& .checkbox-context {
background-color: @color-bi-background-dark-gray;
&:after {
opacity: 1;
}
}
}
} }
} }

12
src/less/base/single/input/radio.less

@ -21,9 +21,15 @@
} }
} }
&.disabled { &.disabled {
&:active, &.active { & .radio-content:after {
& .radio-content:after { background-color: transparent;
background-color: transparent; }
&.active {
& .radio-content {
background-color: @color-bi-background-dark-gray;
&:after {
background-color: @color-bi-background-default;
}
} }
} }
} }

10
src/less/core/utils/common.less

@ -352,16 +352,6 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text; color: @color-bi-text;
} }
&.disabled {
background-color: transparent !important;
color: @color-bi-text-disabled !important;
& .bi-input {
color: @color-bi-text-disabled !important;
}
& .bi-textarea {
color: @color-bi-text-disabled !important;
}
}
} }
.bi-error-background { .bi-error-background {

Loading…
Cancel
Save