Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #284 in ~GUY/fineui from ~WINDY/fineui:master to master 

* commit '2eefbb2ec15a75424a600816c8f40b65a6b652d3':
  增加light-highlight和light-negative
es6
windy 7 years ago
parent
851707813b 2eefbb2ec1
commit
b4dc7f0b65
11 changed files with 467 additions and 10 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. 6
      dist/base.css
  2. 100
      dist/bundle.css
  3. 94
      dist/core.css
  4. 94
      dist/core_without_normalize.css
  5. 2
      src/css/base/single/tip/tip.bubble.css
  6. 2
      src/css/base/single/tip/tip.toast.css
  7. 2
      src/css/base/single/tip/tip.tooltip.css
  8. 94
      src/css/core/utils/common.css
  9. 78
      src/less/core/utils/common.less
  10. 2
      src/less/lib/colors.less
  11. 3
      src/less/lib/constant.less

6
dist/base.css vendored
Unescape View File

@ -997,7 +997,7 @@ body .bi-button.button-ignore.disabled.clear:active,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #fddddd;
background: #ffecec;
color: #ff4949;
}
.bi-tip {
@ -1014,7 +1014,7 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #fddddd;
background: #ffecec;
color: #ff4949;
}
.bi-tooltip {
@ -1030,7 +1030,7 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #fddddd;
background: #ffecec;
color: #ff4949;
border: 1px solid #f4cbcb;
}

100
dist/bundle.css vendored
Unescape View File

@ -900,6 +900,100 @@ i {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-active4:hover,
.bi-list-item-active4.hover {
color: #3685f2;
background-color: #eaf2fd;
}
.bi-list-item-active4:hover .bi-input,
.bi-list-item-active4.hover .bi-input {
color: #3685f2;
}
.bi-list-item-active4:hover .bi-textarea,
.bi-list-item-active4.hover .bi-textarea {
color: #3685f2;
}
.bi-list-item-active4.active,
.bi-list-item-active4:active {
color: #ffffff;
background-color: #3f8ce8;
}
.bi-list-item-active4.active .bi-input,
.bi-list-item-active4:active .bi-input {
color: #ffffff;
}
.bi-list-item-active4.active .bi-textarea,
.bi-list-item-active4:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active4.disabled,
.bi-list-item-active4.disabled:hover,
.bi-list-item-active4.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-input,
.bi-list-item-active4.disabled:hover .bi-input,
.bi-list-item-active4.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-textarea,
.bi-list-item-active4.disabled:hover .bi-textarea,
.bi-list-item-active4.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-high-light,
.bi-list-item-active4.disabled:hover .bi-high-light,
.bi-list-item-active4.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
@ -2610,7 +2704,7 @@ body .bi-button.button-ignore.disabled.clear:active,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #fddddd;
background: #ffecec;
color: #ff4949;
}
.bi-tip {
@ -2627,7 +2721,7 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #fddddd;
background: #ffecec;
color: #ff4949;
}
.bi-tooltip {
@ -2643,7 +2737,7 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #fddddd;
background: #ffecec;
color: #ff4949;
border: 1px solid #f4cbcb;
}

94
dist/core.css vendored
Unescape View File

@ -900,6 +900,100 @@ i {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-active4:hover,
.bi-list-item-active4.hover {
color: #3685f2;
background-color: #eaf2fd;
}
.bi-list-item-active4:hover .bi-input,
.bi-list-item-active4.hover .bi-input {
color: #3685f2;
}
.bi-list-item-active4:hover .bi-textarea,
.bi-list-item-active4.hover .bi-textarea {
color: #3685f2;
}
.bi-list-item-active4.active,
.bi-list-item-active4:active {
color: #ffffff;
background-color: #3f8ce8;
}
.bi-list-item-active4.active .bi-input,
.bi-list-item-active4:active .bi-input {
color: #ffffff;
}
.bi-list-item-active4.active .bi-textarea,
.bi-list-item-active4:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active4.disabled,
.bi-list-item-active4.disabled:hover,
.bi-list-item-active4.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-input,
.bi-list-item-active4.disabled:hover .bi-input,
.bi-list-item-active4.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-textarea,
.bi-list-item-active4.disabled:hover .bi-textarea,
.bi-list-item-active4.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-high-light,
.bi-list-item-active4.disabled:hover .bi-high-light,
.bi-list-item-active4.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;

94
dist/core_without_normalize.css vendored
Unescape View File

@ -617,6 +617,100 @@
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-active4:hover,
.bi-list-item-active4.hover {
color: #3685f2;
background-color: #eaf2fd;
}
.bi-list-item-active4:hover .bi-input,
.bi-list-item-active4.hover .bi-input {
color: #3685f2;
}
.bi-list-item-active4:hover .bi-textarea,
.bi-list-item-active4.hover .bi-textarea {
color: #3685f2;
}
.bi-list-item-active4.active,
.bi-list-item-active4:active {
color: #ffffff;
background-color: #3f8ce8;
}
.bi-list-item-active4.active .bi-input,
.bi-list-item-active4:active .bi-input {
color: #ffffff;
}
.bi-list-item-active4.active .bi-textarea,
.bi-list-item-active4:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active4.disabled,
.bi-list-item-active4.disabled:hover,
.bi-list-item-active4.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-input,
.bi-list-item-active4.disabled:hover .bi-input,
.bi-list-item-active4.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-textarea,
.bi-list-item-active4.disabled:hover .bi-textarea,
.bi-list-item-active4.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-high-light,
.bi-list-item-active4.disabled:hover .bi-high-light,
.bi-list-item-active4.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;

2
src/css/base/single/tip/tip.bubble.css
Unescape View File

@ -5,6 +5,6 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #fddddd;
background: #ffecec;
color: #ff4949;
}

2
src/css/base/single/tip/tip.toast.css
Unescape View File

@ -9,6 +9,6 @@
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #fddddd;
background: #ffecec;
color: #ff4949;
}

2
src/css/base/single/tip/tip.tooltip.css
Unescape View File

@ -11,7 +11,7 @@
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #fddddd;
background: #ffecec;
color: #ff4949;
border: 1px solid #f4cbcb;
}

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

@ -617,6 +617,100 @@
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-active4:hover,
.bi-list-item-active4.hover {
color: #3685f2;
background-color: #eaf2fd;
}
.bi-list-item-active4:hover .bi-input,
.bi-list-item-active4.hover .bi-input {
color: #3685f2;
}
.bi-list-item-active4:hover .bi-textarea,
.bi-list-item-active4.hover .bi-textarea {
color: #3685f2;
}
.bi-list-item-active4.active,
.bi-list-item-active4:active {
color: #ffffff;
background-color: #3f8ce8;
}
.bi-list-item-active4.active .bi-input,
.bi-list-item-active4:active .bi-input {
color: #ffffff;
}
.bi-list-item-active4.active .bi-textarea,
.bi-list-item-active4:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active4.disabled,
.bi-list-item-active4.disabled:hover,
.bi-list-item-active4.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-input,
.bi-list-item-active4.disabled:hover .bi-input,
.bi-list-item-active4.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-textarea,
.bi-list-item-active4.disabled:hover .bi-textarea,
.bi-list-item-active4.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active4.disabled .bi-high-light,
.bi-list-item-active4.disabled:hover .bi-high-light,
.bi-list-item-active4.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;

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

@ -611,6 +611,84 @@
}
}
// 文字和背景hover和active时变化(红)
.bi-list-item-active3 {
&:hover, &.hover {
color: @color-bi-text-failure;
& .bi-input {
color: @color-bi-text-failure;
}
& .bi-textarea {
color: @color-bi-text-failure;
}
background-color: @color-bi-background-light-failure;
}
&.active, &:active {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
background-color: @color-bi-background-failure;
}
&.disabled {
&, &:hover, &:active {
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-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
// 文字和背景hover和active时变化
.bi-list-item-active4 {
&:hover, &.hover {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-light-highlight;
}
&.active, &:active {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
background-color: @color-bi-background-highlight;
}
&.disabled {
&, &:hover, &:active {
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-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
//有选中效果
.bi-list-item-select {
&:hover, &.hover {

2
src/less/lib/colors.less
Unescape View File

@ -56,6 +56,8 @@
@color-bi-background-warning: @background-color-warning;
//背景提亮色
@color-bi-background-highlight: @background-color-highlight;
//背景提亮色(浅)
@color-bi-background-light-highlight: @background-color-light-highlight;
//黑色边框色
@color-bi-border-black: @border-color-black;

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

@ -35,13 +35,14 @@
@background-color-default-theme-dark: #242640;//
@background-color-normal: #fafbfc;//
@background-color-normal-theme-dark: #191B2B;//
@background-color-light-highlight: #eaf2fd;
@background-color-highlight: #3f8ce8;
@background-color-dark: #d4dadd;
@background-color-gray: #999999;
@background-color-disabled: #cccccc;
@background-color-negative: #ff4949;
@background-color-light-negative: #fddddd;
@background-color-light-negative: #ffecec;
@background-color-warning: #faaa39;
@background-color-dark-success: #58cc7d;

Write Preview
Loading…
Cancel
Save