From d16da7f859bfedb57eb5dedec24359d12467a654 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 30 Jan 2018 19:48:24 +0800 Subject: [PATCH] update --- dist/base.css | 36 +++++++++++++++-------- dist/bundle.css | 36 +++++++++++++++-------- dist/fineui.css | 36 +++++++++++++++-------- src/css/base/single/tip/tip.bubble.css | 14 +++++++++ src/css/base/single/tip/tip.css | 11 ++++--- src/css/base/single/tip/tip.tooltip.css | 11 ++++--- src/less/base/single/tip/tip.tooltip.less | 6 ++-- src/less/lib/colors.less | 2 +- src/less/lib/constant.less | 2 +- 9 files changed, 101 insertions(+), 53 deletions(-) diff --git a/dist/base.css b/dist/base.css index 209d58580..5edaea46a 100644 --- a/dist/base.css +++ b/dist/base.css @@ -1173,9 +1173,23 @@ body .bi-button.button-ignore.disabled.clear:active, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; +} +.bi-bubble .bubble-error { background: #ffecec; color: #ff4949; } +.bi-bubble .bubble-common { + background: #eaf2fd; + color: #3685f2; +} +.bi-bubble .bubble-success { + background: #e1f4e7; + color: #5cb75d; +} +.bi-bubble .bubble-warning { + background: #feeed7; + color: #faaa39; +} .bi-bubble { font-size: 14px; } @@ -1236,16 +1250,15 @@ body .bi-button.button-ignore.disabled.clear:active, -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } .bi-toast { font-size: 14px; @@ -1277,16 +1290,15 @@ body .bi-button.button-ignore.disabled.clear:active, -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } .bi-sql-editor .cm-s-default span[class*="#"] { color: #3685f2; diff --git a/dist/bundle.css b/dist/bundle.css index d00cb6137..c2c425220 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -3220,9 +3220,23 @@ body .bi-button.button-ignore.disabled.clear:active, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; +} +.bi-bubble .bubble-error { background: #ffecec; color: #ff4949; } +.bi-bubble .bubble-common { + background: #eaf2fd; + color: #3685f2; +} +.bi-bubble .bubble-success { + background: #e1f4e7; + color: #5cb75d; +} +.bi-bubble .bubble-warning { + background: #feeed7; + color: #faaa39; +} .bi-bubble { font-size: 14px; } @@ -3283,16 +3297,15 @@ body .bi-button.button-ignore.disabled.clear:active, -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } .bi-toast { font-size: 14px; @@ -3324,16 +3337,15 @@ body .bi-button.button-ignore.disabled.clear:active, -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } .bi-sql-editor .cm-s-default span[class*="#"] { color: #3685f2; diff --git a/dist/fineui.css b/dist/fineui.css index 0f6ea4762..4fc1d05a3 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -3220,9 +3220,23 @@ body .bi-button.button-ignore.disabled.clear:active, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; +} +.bi-bubble .bubble-error { background: #ffecec; color: #ff4949; } +.bi-bubble .bubble-common { + background: #eaf2fd; + color: #3685f2; +} +.bi-bubble .bubble-success { + background: #e1f4e7; + color: #5cb75d; +} +.bi-bubble .bubble-warning { + background: #feeed7; + color: #faaa39; +} .bi-bubble { font-size: 14px; } @@ -3283,16 +3297,15 @@ body .bi-button.button-ignore.disabled.clear:active, -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } .bi-toast { font-size: 14px; @@ -3324,16 +3337,15 @@ body .bi-button.button-ignore.disabled.clear:active, -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } .bi-sql-editor .cm-s-default span[class*="#"] { color: #3685f2; diff --git a/src/css/base/single/tip/tip.bubble.css b/src/css/base/single/tip/tip.bubble.css index 0d18fb6dc..59ac45de3 100644 --- a/src/css/base/single/tip/tip.bubble.css +++ b/src/css/base/single/tip/tip.bubble.css @@ -5,6 +5,20 @@ -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; +} +.bi-bubble .bubble-error { background: #ffecec; color: #ff4949; } +.bi-bubble .bubble-common { + background: #eaf2fd; + color: #3685f2; +} +.bi-bubble .bubble-success { + background: #e1f4e7; + color: #5cb75d; +} +.bi-bubble .bubble-warning { + background: #feeed7; + color: #faaa39; +} diff --git a/src/css/base/single/tip/tip.css b/src/css/base/single/tip/tip.css index 7486207b9..e5ddf3362 100644 --- a/src/css/base/single/tip/tip.css +++ b/src/css/base/single/tip/tip.css @@ -58,14 +58,13 @@ -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } diff --git a/src/css/base/single/tip/tip.tooltip.css b/src/css/base/single/tip/tip.tooltip.css index 3f5eaedb3..04386aa15 100644 --- a/src/css/base/single/tip/tip.tooltip.css +++ b/src/css/base/single/tip/tip.tooltip.css @@ -4,14 +4,13 @@ -moz-border-radius: 2px; border-radius: 2px; font-size: 12px; + color: #ffffff; } .bi-tooltip.tooltip-success { - background: #fff5c1; - border: 1px solid #fff5c1; - color: #1a1a1a; + background: #647185; + border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ffecec; - color: #ff4949; - border: 1px solid #f4cbcb; + background: #ff4949; + border: 1px solid #e85050; } diff --git a/src/less/base/single/tip/tip.tooltip.less b/src/less/base/single/tip/tip.tooltip.less index 35c6e8634..3c9f1d07a 100644 --- a/src/less/base/single/tip/tip.tooltip.less +++ b/src/less/base/single/tip/tip.tooltip.less @@ -4,14 +4,14 @@ max-width: 250px; .border-radius(2px); font-size: 12px; + color: @color-bi-text; &.tooltip-success{ background: @color-bi-tooltip-success-background; border: 1px solid @color-bi-tooltip-success-background; - color: @color-bi-text-black; + } &.tooltip-warning{ - background: @color-bi-background-light-failure; - color: @color-bi-text-failure; + background: @color-bi-background-failure; border: 1px solid @color-bi-tooltip-failure-border; } } \ No newline at end of file diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index 0c2878b49..919da3690 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -86,7 +86,7 @@ //成功边框 @color-bi-tooltip-success-border: @border-color-normal-success; //失败边框 -@color-bi-tooltip-failure-border: @border-color-light-negative; +@color-bi-tooltip-failure-border: @border-color-negative; //mask颜色 @color-bi-button-mask: @color-bi-background-black; diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 9d99830d5..cbee89bba 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -48,7 +48,7 @@ @background-color-dark-success: #58cc7d; @background-color-light-success: #e1f4e7; -@background-color-normal-success: #fff5c1; +@background-color-normal-success: #647185; //border color @border-color-default: #ffffff;