Browse Source

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

* commit '66f94d0fdfc2179b8216ea012516f7d984fb4158':
  无JIRA任务 颜色不对
es6
imp 7 years ago
parent
commit
007ae2f940
  1. 2
      dist/_fineui.min.js
  2. 2
      dist/base.css
  3. 2
      dist/bundle.css
  4. 2
      dist/bundle.min.css
  5. 2
      dist/bundle.min.js
  6. 2
      dist/fineui.css
  7. 2
      dist/fineui.min.css
  8. 2
      dist/fineui.min.js
  9. 2
      src/css/base/single/button/button.css
  10. 2
      src/less/lib/constant.less

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.css vendored

@ -1282,7 +1282,7 @@ body .bi-button.button-error.disabled.base-disabled,
#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,
#body .bi-button.button-warning.disabled.base-disabled { #body .bi-button.button-warning.disabled.base-disabled {
background: #d0d4da !important; background: #F2F4F7 !important;
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
body .bi-button.button-common.disabled, body .bi-button.button-common.disabled,

2
dist/bundle.css vendored

@ -3128,7 +3128,7 @@ body .bi-button.button-error.disabled.base-disabled,
#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,
#body .bi-button.button-warning.disabled.base-disabled { #body .bi-button.button-warning.disabled.base-disabled {
background: #d0d4da !important; background: #F2F4F7 !important;
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
body .bi-button.button-common.disabled, body .bi-button.button-common.disabled,

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

2
dist/fineui.css vendored

@ -3128,7 +3128,7 @@ body .bi-button.button-error.disabled.base-disabled,
#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,
#body .bi-button.button-warning.disabled.base-disabled { #body .bi-button.button-warning.disabled.base-disabled {
background: #d0d4da !important; background: #F2F4F7 !important;
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
body .bi-button.button-common.disabled, body .bi-button.button-common.disabled,

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
src/css/base/single/button/button.css

@ -163,7 +163,7 @@ body .bi-button.button-error.disabled.base-disabled,
#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,
#body .bi-button.button-warning.disabled.base-disabled { #body .bi-button.button-warning.disabled.base-disabled {
background: #d0d4da !important; background: #F2F4F7 !important;
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
body .bi-button.button-common.disabled, body .bi-button.button-common.disabled,

2
src/less/lib/constant.less

@ -59,7 +59,7 @@
@background-color-dark: #d4dadd; @background-color-dark: #d4dadd;
@background-color-light-gray: #F2F4F7; @background-color-light-gray: #F2F4F7;
@background-color-dark-gray: #d0d4da; @background-color-dark-gray: #d0d4da;
@background-color-disabled: #d0d4da; @background-color-disabled: #F2F4F7;
@background-color-yellow: #ffc101;// @background-color-yellow: #ffc101;//
@background-color-negative: #ff4949; @background-color-negative: #ff4949;

Loading…
Cancel
Save