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

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

* commit '72308283cece8c2e4b2c846bf27577cc0a8edced':
  update
es6
windy 7 years ago
parent
82f4abb952 72308283ce
commit
27a4104065
11 changed files with 22 additions and 24 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. 6
      dist/bundle.css
  3. 2
      dist/bundle.min.css
  4. 2
      src/css/base/single/tip/tip.bubble.css
  5. 2
      src/css/base/single/tip/tip.toast.css
  6. 2
      src/css/base/single/tip/tip.tooltip.css
  7. 2
      src/less/base/single/tip/tip.bubble.less
  8. 4
      src/less/base/single/tip/tip.toast.less
  9. 4
      src/less/base/single/tip/tip.tooltip.less
  10. 13
      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: #ff4949;
background: #fddddd;
color: #ff4949;
}
.bi-tip {
@ -1014,7 +1014,7 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #ff4949;
background: #fddddd;
color: #ff4949;
}
.bi-tooltip {
@ -1030,7 +1030,7 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #ff4949;
background: #fddddd;
color: #ff4949;
border: 1px solid #f4cbcb;
}

6
dist/bundle.css vendored
Unescape View File

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

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

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: #ff4949;
background: #fddddd;
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: #ff4949;
background: #fddddd;
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: #ff4949;
background: #fddddd;
color: #ff4949;
border: 1px solid #f4cbcb;
}

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

@ -4,7 +4,7 @@
font-size: @font-size-14;
& .bubble-text{
.border-radius(2px);
background: @color-bi-tip-warning-background;
background: @color-bi-background-light-failure;
color: @color-bi-text-failure;
}
}

4
src/less/base/single/tip/tip.toast.less
Unescape View File

@ -4,11 +4,11 @@
font-size: @font-size-14;
.border-radius(2px);
&.toast-success{
background: @color-bi-toast-success-background;
background: @color-bi-background-light-success;
color: @color-bi-text-success;
}
&.toast-warning{
background: @color-bi-tip-warning-background;
background: @color-bi-background-light-failure;
color: @color-bi-text-failure;
}
}

4
src/less/base/single/tip/tip.tooltip.less
Unescape View File

@ -10,8 +10,8 @@
color: @color-bi-text-black;
}
&.tooltip-warning{
background: @color-bi-tip-warning-background;
background: @color-bi-background-light-failure;
color: @color-bi-text-failure;
border: 1px solid @color-bi-tooltip-warning-border;
border: 1px solid @color-bi-tooltip-failure-border;
}
}

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

@ -46,8 +46,12 @@
@color-bi-background-disabled: @background-color-disabled;
//成功背景色
@color-bi-background-success: @background-color-dark-success;
//成功背景色(浅)
@color-bi-background-light-success: @background-color-light-success;
//失败背景色
@color-bi-background-failure: @background-color-negative;
//失败背景色(浅)
@color-bi-background-light-failure: @background-color-light-negative;
//警示背景色
@color-bi-background-warning: @background-color-warning;
//背景提亮色
@ -72,20 +76,13 @@
//边框提亮
@color-bi-border-highlight: @border-color-highlight;
//bubble、toast、tooltip通用
@color-bi-tip-warning-background: @background-color-negative;
//toast
//成功背景
@color-bi-toast-success-background: @background-color-light-success;
//tooltip
//成功背景
@color-bi-tooltip-success-background: @background-color-normal-success;
//成功边框
@color-bi-tooltip-success-border: @border-color-normal-success;
//失败边框
@color-bi-tooltip-warning-border: @border-color-error;
@color-bi-tooltip-failure-border: @border-color-light-negative;
//mask颜色
@color-bi-button-mask: @color-bi-background-black;

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

@ -41,6 +41,7 @@
@background-color-disabled: #cccccc;
@background-color-negative: #ff4949;
@background-color-light-negative: #fddddd;
@background-color-warning: #faaa39;
@background-color-dark-success: #58cc7d;
@ -57,7 +58,7 @@
@border-color-warning: #fbb03b;
@border-color-negative: #e85050;
@border-color-success: #58cc7d;
@border-color-error: #f4cbcb;
@border-color-light-negative: #f4cbcb;
@border-color-normal-success: #eddea2;
//split color

Write Preview
Loading…
Cancel
Save