Browse Source

warning与negative

master
windy 7 years ago
parent
commit
79486256d9
  1. 18
      bi/base.css
  2. 1
      bi/base.js
  3. 6
      bi/core.css
  4. 10
      bi/widget.css
  5. 18
      dist/base.css
  6. 1
      dist/base.js
  7. 34
      dist/bundle.css
  8. 1
      dist/bundle.js
  9. 2
      dist/bundle.min.css
  10. 6
      dist/core.css
  11. 6
      dist/core_without_normalize.css
  12. 6
      dist/resource.css
  13. 10
      dist/widget.css
  14. 1
      src/base/sql/codemirrior/sql-hint.js
  15. 2
      src/css/base/single/button/button.css
  16. 2
      src/css/base/single/editor/editor.code.css
  17. 2
      src/css/base/single/input/input.css
  18. 4
      src/css/base/single/tip/tip.bubble.css
  19. 4
      src/css/base/single/tip/tip.toast.css
  20. 4
      src/css/base/single/tip/tip.tooltip.css
  21. 6
      src/css/core/utils/common.css
  22. 6
      src/css/resource/font.css
  23. 2
      src/css/widget/interactivearrangement/interactivearrangement.css
  24. 2
      src/css/widget/multiselect/search/multiselect.search.pane.css
  25. 2
      src/css/widget/numberinterval/numberinterval.css
  26. 4
      src/css/widget/timeinterval/timeinterval.css
  27. 6
      src/less/base/single/button/button.less
  28. 2
      src/less/base/single/editor/editor.code.less
  29. 2
      src/less/base/single/input/input.less
  30. 2
      src/less/base/single/tip/tip.bubble.less
  31. 2
      src/less/base/single/tip/tip.toast.less
  32. 2
      src/less/base/single/tip/tip.tooltip.less
  33. 12
      src/less/lib/colors.less
  34. 7
      src/less/lib/constant.less
  35. 2
      src/less/resource/font.less
  36. 2
      src/less/widget/multiselect/search/multiselect.search.pane.less
  37. 2
      src/less/widget/numberinterval/numberinterval.less
  38. 4
      src/less/widget/timeinterval/timeinterval.less

18
bi/base.css

@ -785,7 +785,7 @@ body .bi-button.button-warning.clear,
#body .bi-button.button-warning.clear,
body .bi-button.button-warning.clear .b-font:before,
#body .bi-button.button-warning.clear .b-font:before {
color: #faaa39;
color: #ff4949;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -914,7 +914,7 @@ body .bi-button.button-ignore.disabled.clear:active,
display: inline-block;
}
.bi-code-editor .error-param {
color: #faaa39;
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
@ -967,7 +967,7 @@ body .bi-button.button-ignore.disabled.clear:active,
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #faaa39 !important;
color: #ff4949 !important;
}
.bi-label {
text-overflow: ellipsis;
@ -999,8 +999,8 @@ body .bi-button.button-ignore.disabled.clear:active,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
}
.bi-tip {
position: fixed !important;
@ -1016,8 +1016,8 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
}
.bi-tooltip {
max-width: 250px;
@ -1032,8 +1032,8 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
border: 1px solid #f4cbcb;
}
.bi-sql-editor .cm-s-default span[class*="#"] {

1
bi/base.js

@ -20752,6 +20752,7 @@ BI.Trigger = BI.inherit(BI.Single, {
// });
// label.setTitle(data.description, {
// container: "body"
// });
// }
};

6
bi/core.css

@ -419,13 +419,13 @@ i {
border-bottom: 1px solid #525466;
}
.bi-keyword-red-mark {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-input {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-textarea {
color: #ff4949;
color: #faaa39;
}
.bi-high-light {
color: #3685f2;

10
bi/widget.css

@ -73,7 +73,7 @@
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-line {
z-index: 1000000000;
background-color: #ff4949;
background-color: #faaa39;
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
z-index: 1000000000;
@ -128,7 +128,7 @@
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
color: #ff4949;
}
.bi-multi-select-check-selected-button {
z-index: 1;
@ -190,7 +190,7 @@
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #faaa39 !important;
color: #ff4949 !important;
}
.bi-page-table-cell {
-webkit-user-select: text;
@ -347,10 +347,10 @@
border-radius: 3px;
}
.bi-param-time-interval.time-error .bi-input {
color: #faaa39;
color: #ff4949;
}
.bi-param-time-interval.time-error .sign-editor-text {
color: #faaa39;
color: #ff4949;
}
.bi-year-popup .year-popup-navigation {
line-height: 30px;

18
dist/base.css vendored

@ -785,7 +785,7 @@ body .bi-button.button-warning.clear,
#body .bi-button.button-warning.clear,
body .bi-button.button-warning.clear .b-font:before,
#body .bi-button.button-warning.clear .b-font:before {
color: #faaa39;
color: #ff4949;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -914,7 +914,7 @@ body .bi-button.button-ignore.disabled.clear:active,
display: inline-block;
}
.bi-code-editor .error-param {
color: #faaa39;
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
@ -967,7 +967,7 @@ body .bi-button.button-ignore.disabled.clear:active,
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #faaa39 !important;
color: #ff4949 !important;
}
.bi-label {
text-overflow: ellipsis;
@ -999,8 +999,8 @@ body .bi-button.button-ignore.disabled.clear:active,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
}
.bi-tip {
position: fixed !important;
@ -1016,8 +1016,8 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
}
.bi-tooltip {
max-width: 250px;
@ -1032,8 +1032,8 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
border: 1px solid #f4cbcb;
}
.bi-sql-editor .cm-s-default span[class*="#"] {

1
dist/base.js vendored

@ -20752,6 +20752,7 @@ BI.Trigger = BI.inherit(BI.Single, {
// });
// label.setTitle(data.description, {
// container: "body"
// });
// }
};

34
dist/bundle.css vendored

@ -419,13 +419,13 @@ i {
border-bottom: 1px solid #525466;
}
.bi-keyword-red-mark {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-input {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-textarea {
color: #ff4949;
color: #faaa39;
}
.bi-high-light {
color: #3685f2;
@ -2380,7 +2380,7 @@ body .bi-button.button-warning.clear,
#body .bi-button.button-warning.clear,
body .bi-button.button-warning.clear .b-font:before,
#body .bi-button.button-warning.clear .b-font:before {
color: #faaa39;
color: #ff4949;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,
@ -2509,7 +2509,7 @@ body .bi-button.button-ignore.disabled.clear:active,
display: inline-block;
}
.bi-code-editor .error-param {
color: #faaa39;
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
@ -2562,7 +2562,7 @@ body .bi-button.button-ignore.disabled.clear:active,
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #faaa39 !important;
color: #ff4949 !important;
}
.bi-label {
text-overflow: ellipsis;
@ -2594,8 +2594,8 @@ body .bi-button.button-ignore.disabled.clear:active,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
}
.bi-tip {
position: fixed !important;
@ -2611,8 +2611,8 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #5cb75d;
}
.bi-toast.toast-warning {
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
}
.bi-tooltip {
max-width: 250px;
@ -2627,8 +2627,8 @@ body .bi-button.button-ignore.disabled.clear:active,
color: #1a1a1a;
}
.bi-tooltip.tooltip-warning {
background: #fddddd;
color: #faaa39;
background: #ff4949;
color: #ff4949;
border: 1px solid #f4cbcb;
}
.bi-sql-editor .cm-s-default span[class*="#"] {
@ -3263,7 +3263,7 @@ ul.ztree.zTreeDragUL {
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-line {
z-index: 1000000000;
background-color: #ff4949;
background-color: #faaa39;
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
z-index: 1000000000;
@ -3318,7 +3318,7 @@ ul.ztree.zTreeDragUL {
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
color: #ff4949;
}
.bi-multi-select-check-selected-button {
z-index: 1;
@ -3380,7 +3380,7 @@ ul.ztree.zTreeDragUL {
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #faaa39 !important;
color: #ff4949 !important;
}
.bi-page-table-cell {
-webkit-user-select: text;
@ -3537,10 +3537,10 @@ ul.ztree.zTreeDragUL {
border-radius: 3px;
}
.bi-param-time-interval.time-error .bi-input {
color: #faaa39;
color: #ff4949;
}
.bi-param-time-interval.time-error .sign-editor-text {
color: #faaa39;
color: #ff4949;
}
.bi-year-popup .year-popup-navigation {
line-height: 30px;

1
dist/bundle.js vendored

@ -46564,6 +46564,7 @@ BI.Trigger = BI.inherit(BI.Single, {
// });
// label.setTitle(data.description, {
// container: "body"
// });
// }
};

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/core.css vendored

@ -419,13 +419,13 @@ i {
border-bottom: 1px solid #525466;
}
.bi-keyword-red-mark {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-input {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-textarea {
color: #ff4949;
color: #faaa39;
}
.bi-high-light {
color: #3685f2;

6
dist/core_without_normalize.css vendored

@ -136,13 +136,13 @@
border-bottom: 1px solid #525466;
}
.bi-keyword-red-mark {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-input {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-textarea {
color: #ff4949;
color: #faaa39;
}
.bi-high-light {
color: #3685f2;

6
dist/resource.css vendored

@ -398,7 +398,7 @@ textarea::-webkit-scrollbar-thumb:hover {
.search-close-h-font:hover .b-font:before,
.search-close-h-font.hover .b-font:before {
content: "\e600";
color: #faaa39;
color: #ff4949;
}
.search-close-h-font.disabled .b-font:before {
content: "\e600";
@ -971,11 +971,11 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.drag-tag-font .b-font:before {
content: "\e600";
color: #ff4949;
color: #faaa39;
}
.drag-tag-font.disabled .b-font:before {
content: "\e600";
color: #ff4949;
color: #faaa39;
}
.less-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

10
dist/widget.css vendored

@ -73,7 +73,7 @@
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-line {
z-index: 1000000000;
background-color: #ff4949;
background-color: #faaa39;
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
z-index: 1000000000;
@ -128,7 +128,7 @@
border-radius: 2px 2px 2px 2px;
}
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
color: #ff4949;
}
.bi-multi-select-check-selected-button {
z-index: 1;
@ -190,7 +190,7 @@
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #faaa39 !important;
color: #ff4949 !important;
}
.bi-page-table-cell {
-webkit-user-select: text;
@ -347,10 +347,10 @@
border-radius: 3px;
}
.bi-param-time-interval.time-error .bi-input {
color: #faaa39;
color: #ff4949;
}
.bi-param-time-interval.time-error .sign-editor-text {
color: #faaa39;
color: #ff4949;
}
.bi-year-popup .year-popup-navigation {
line-height: 30px;

1
src/base/sql/codemirrior/sql-hint.js

@ -300,6 +300,7 @@
// });
// label.setTitle(data.description, {
// container: "body"
// });
// }
};

2
src/css/base/single/button/button.css

@ -101,7 +101,7 @@ body .bi-button.button-warning.clear,
#body .bi-button.button-warning.clear,
body .bi-button.button-warning.clear .b-font:before,
#body .bi-button.button-warning.clear .b-font:before {
color: #faaa39;
color: #ff4949;
}
body .bi-button.button-common.disabled,
#body .bi-button.button-common.disabled,

2
src/css/base/single/editor/editor.code.css

@ -9,7 +9,7 @@
display: inline-block;
}
.bi-code-editor .error-param {
color: #faaa39;
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;

2
src/css/base/single/input/input.css

@ -15,5 +15,5 @@
.bi-input.bi-input-error,
.bi-textarea.bi-input-error {
border: none;
color: #faaa39 !important;
color: #ff4949 !important;
}

4
src/css/base/single/tip/tip.bubble.css

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

4
src/css/base/single/tip/tip.toast.css

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

4
src/css/base/single/tip/tip.tooltip.css

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

6
src/css/core/utils/common.css

@ -136,13 +136,13 @@
border-bottom: 1px solid #525466;
}
.bi-keyword-red-mark {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-input {
color: #ff4949;
color: #faaa39;
}
.bi-keyword-red-mark .bi-textarea {
color: #ff4949;
color: #faaa39;
}
.bi-high-light {
color: #3685f2;

6
src/css/resource/font.css

@ -69,7 +69,7 @@
.search-close-h-font:hover .b-font:before,
.search-close-h-font.hover .b-font:before {
content: "\e600";
color: #faaa39;
color: #ff4949;
}
.search-close-h-font.disabled .b-font:before {
content: "\e600";
@ -642,11 +642,11 @@
}
.drag-tag-font .b-font:before {
content: "\e600";
color: #ff4949;
color: #faaa39;
}
.drag-tag-font.disabled .b-font:before {
content: "\e600";
color: #ff4949;
color: #faaa39;
}
.less-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

2
src/css/widget/interactivearrangement/interactivearrangement.css

@ -1,6 +1,6 @@
.bi-interactive-arrangement .interactive-arrangement-dragtag-line {
z-index: 1000000000;
background-color: #ff4949;
background-color: #faaa39;
}
.bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
z-index: 1000000000;

2
src/css/widget/multiselect/search/multiselect.search.pane.css

@ -1,3 +1,3 @@
.bi-multi-select-search-pane .multi-select-toolbar {
color: #faaa39;
color: #ff4949;
}

2
src/css/widget/numberinterval/numberinterval.css

@ -37,5 +37,5 @@
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #faaa39 !important;
color: #ff4949 !important;
}

4
src/css/widget/timeinterval/timeinterval.css

@ -1,6 +1,6 @@
.bi-param-time-interval.time-error .bi-input {
color: #faaa39;
color: #ff4949;
}
.bi-param-time-interval.time-error .sign-editor-text {
color: #faaa39;
color: #ff4949;
}

6
src/less/base/single/button/button.less

@ -63,12 +63,12 @@ body .bi-button, #body .bi-button {
&, & .b-font:before {
color: @color-bi-text;
}
background-color: @color-bi-background-delete;
border-color: @color-bi-border-delete;
background-color: @color-bi-background-failure;
border-color: @color-bi-border-failure;
}
&.clear {
&, & .b-font:before {
color: @color-bi-text-warning;
color: @color-bi-text-failure;
}
background-color: transparent;
border-width: 0;

2
src/less/base/single/editor/editor.code.less

@ -10,7 +10,7 @@
display: inline-block;
}
& .error-param {
color: @color-bi-text-warning;
color: @color-bi-text-failure;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;

2
src/less/base/single/input/input.less

@ -14,6 +14,6 @@
&.bi-input-error{
border: none;
color:@color-bi-text-warning !important;
color:@color-bi-text-failure !important;
}
}

2
src/less/base/single/tip/tip.bubble.less

@ -5,6 +5,6 @@
& .bubble-text{
.border-radius(2px);
background: @color-bi-tip-warning-background;
color: @color-bi-text-warning;
color: @color-bi-text-failure;
}
}

2
src/less/base/single/tip/tip.toast.less

@ -9,6 +9,6 @@
}
&.toast-warning{
background: @color-bi-tip-warning-background;
color: @color-bi-text-warning;
color: @color-bi-text-failure;
}
}

2
src/less/base/single/tip/tip.tooltip.less

@ -11,7 +11,7 @@
}
&.tooltip-warning{
background: @color-bi-tip-warning-background;
color: @color-bi-text-warning;
color: @color-bi-text-failure;
border: 1px solid @color-bi-tooltip-warning-border;
}
}

12
src/less/lib/colors.less

@ -23,11 +23,11 @@
//成功字体颜色
@color-bi-text-success: @font-color-success;
//失败字体颜色
@color-bi-text-warning: @font-color-warning;
@color-bi-text-failure: @font-color-negative;
//基本提亮颜色
@color-bi-text-highlight: @font-color-highlight;
//标红色
@color-bi-text-redmark: @font-color-redmark;
@color-bi-text-redmark: @font-color-warning;
//普通背景
@color-bi-background-normal: @background-color-normal;
@ -48,8 +48,6 @@
@color-bi-background-success: @background-color-dark-success;
//失败背景色
@color-bi-background-failure: @background-color-negative;
//删除背景色
@color-bi-background-delete: @background-color-negative;
//警示背景色
@color-bi-background-warning: @background-color-warning;
//背景提亮色
@ -59,8 +57,6 @@
@color-bi-border-black: @border-color-black;
//默认边框色
@color-bi-border-default: @border-color-default;
//outline颜色
@color-bi-border-outline: @border-color-outline;
//边框线颜色
@color-bi-border-line: @border-color-line;
//深色系边框线色
@ -71,15 +67,13 @@
@color-bi-border-success: @border-color-success;
//失败边框色
@color-bi-border-failure: @border-color-negative;
//删除边框色
@color-bi-border-delete: @border-color-negative;
//警示边框色
@color-bi-border-warning: @border-color-warning;
//边框提亮
@color-bi-border-highlight: @border-color-highlight;
//bubble、toast、tooltip通用
@color-bi-tip-warning-background: @background-color-alert;
@color-bi-tip-warning-background: @background-color-negative;
//toast
//成功背景

7
src/less/lib/constant.less

@ -27,8 +27,7 @@
@font-color-highlight: #3685f2;
@font-color-success: #5cb75d;
@font-color-warning: #faaa39;//
@font-color-redmark: #ff4949;//
@font-color-orange: #fbb03b;//
@font-color-negative: #ff4949;//
//background color
@background-color-black: #1a1a1a;//
@ -41,9 +40,8 @@
@background-color-gray: #999999;
@background-color-disabled: #cccccc;
@background-color-alert: #fddddd;
@background-color-warning: #faaa39;
@background-color-negative: #ff4949;
@background-color-warning: #faaa39;
@background-color-dark-success: #58cc7d;
@background-color-light-success: #e1f4e7;
@ -54,7 +52,6 @@
@border-color-black: #1a1a1a;
@border-color-line: #d4dadd;
@border-color-line-theme-dark: #525466;
@border-color-outline: #3f8ce8;
@border-color-highlight: #178cdf;
@border-color-warning: #fbb03b;

2
src/less/resource/font.less

@ -20,7 +20,7 @@
.font-hover-active(close-ha-font, @font-cross);
//搜索框中的带有hover后颜色变红的图标
.font-hover(search-close-h-font, @font-cross, inherit, @color-bi-text-warning);
.font-hover(search-close-h-font, @font-cross, inherit, @color-bi-text-failure);
.font-hover(pre-page-h-font, @font-arrow-left);

2
src/less/widget/multiselect/search/multiselect.search.pane.less

@ -3,6 +3,6 @@
.bi-multi-select-search-pane{
.multi-select-toolbar{
color: @color-bi-text-warning;
color: @color-bi-text-failure;
}
}

2
src/less/widget/numberinterval/numberinterval.less

@ -26,6 +26,6 @@
}
&.number-error .bi-input {
color: @color-bi-text-warning !important;
color: @color-bi-text-failure !important;
}
}

4
src/less/widget/timeinterval/timeinterval.less

@ -2,9 +2,9 @@
.bi-param-time-interval{
&.time-error .bi-input{
color:@color-bi-text-warning
color:@color-bi-text-failure
}
&.time-error .sign-editor-text{
color:@color-bi-text-warning
color:@color-bi-text-failure
}
}
Loading…
Cancel
Save