Browse Source

Pull request #2409: 无JIAR任务 chore: button样式优化

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '717631a6800e7f6310338b89b76c3077503db6d4':
  chore: button样式优化
es6
guy 3 years ago
parent
commit
47b50eb57d
  1. 19
      src/less/base/single/button/button.less
  2. 4
      src/less/lib/theme.less

19
src/less/base/single/button/button.less

@ -43,22 +43,22 @@ body .bi-button, #body .bi-button {
&.clear, &.clear .b-font:before { &.clear, &.clear .b-font:before {
color: @color-bi-text-common-clear-button; color: @color-bi-text-common-clear-button;
} }
&.ghost{ &.ghost {
&, & .b-font:before{ &, & .b-font:before {
color: @color-bi-text-common-ghost-button; color: @color-bi-text-common-ghost-button;
} }
&:hover{ &:hover {
color: @color-bi-text; color: @color-bi-text;
background-color: @color-bi-background-hover-common-ghost-button; background-color: @color-bi-background-hover-common-ghost-button;
} }
&:active{ &:active {
background-color: @color-bi-background-active-common-ghost-button; background-color: @color-bi-background-active-common-ghost-button;
} }
} }
} }
&.button-ignore { &.button-ignore {
& { & {
background-color: transparent; background-color: @color-bi-background-ignore-button;
&:not(.clear, .ghost) { &:not(.clear, .ghost) {
border-color: @color-bi-border-ignore-button; border-color: @color-bi-border-ignore-button;
} }
@ -342,6 +342,7 @@ body .bi-button, #body .bi-button {
} }
} }
&.button-ignore { &.button-ignore {
background-color: @color-bi-background-ignore-button-theme-dark;
&:hover{ &:hover{
background-color: @color-bi-background-hover-ignore-button-theme-dark; background-color: @color-bi-background-hover-ignore-button-theme-dark;
} }
@ -361,13 +362,17 @@ body .bi-button, #body .bi-button {
} }
&.button-success.disabled, &.button-success.disabled,
&.button-error.disabled, &.button-error.disabled,
&.button-warning.disabled, &.button-warning.disabled {
&.button-ignore.disabled {
&, &.base-disabled { &, &.base-disabled {
background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important; background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important;
@ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%)); @ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%));
filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})"; filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})";
} }
} }
&.button-ignore.disabled {
&, &.base-disabled {
background-color: @color-bi-background-ignore-button-theme-dark !important;
}
}
} }
} }

4
src/less/lib/theme.less

@ -71,6 +71,8 @@
@color-bi-background-active-common-ghost-button-theme-dark: @color-bi-background-default; @color-bi-background-active-common-ghost-button-theme-dark: @color-bi-background-default;
@color-bi-text-ignore-button: @color-bi-text-highlight; @color-bi-text-ignore-button: @color-bi-text-highlight;
@color-bi-border-ignore-button: @color-bi-border-highlight; @color-bi-border-ignore-button: @color-bi-border-highlight;
@color-bi-background-ignore-button: @color-bi-background-default;
@color-bi-background-ignore-button-theme-dark: @color-bi-background-default-theme-dark;
@color-bi-background-hover-ignore-button-theme-dark: @color-bi-blue-10; @color-bi-background-hover-ignore-button-theme-dark: @color-bi-blue-10;
@color-bi-background-active-ignore-button-theme-dark: @color-bi-blue-10; @color-bi-background-active-ignore-button-theme-dark: @color-bi-blue-10;
@color-bi-text-success-button: @color-bi-text; @color-bi-text-success-button: @color-bi-text;
@ -220,4 +222,4 @@
@color-bi-text-error-year-month-interval: @color-bi-text-failure; @color-bi-text-error-year-month-interval: @color-bi-text-failure;
@color-bi-text-error-year-quarter-interval: @color-bi-text-failure; @color-bi-text-error-year-quarter-interval: @color-bi-text-failure;
// 表单 // 表单
@color-bi-background-error-form: @color-bi-red-5; @color-bi-background-error-form: @color-bi-red-5;

Loading…
Cancel
Save