diff --git a/bi.lessconfig.json b/bi.lessconfig.json index e1e853591..d4042b18d 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -8,7 +8,7 @@ "@color-light-gray": "#ECEEF3", "@color-light-gray-theme-dark": "#292F45", "@border-color-dark-line": "#2E3A4D", - "@color-sliver-theme-dark": "363E55", + "@color-sliver-theme-dark": "#363E55", "@border-color-disabled": "#E7E8EB", "@color-bi-background-active-radio": "transparent", @@ -18,6 +18,7 @@ "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-tooltip-success": "#2E3A4D", + "@color-bi-text-header-background": "#647185", "@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-background-toast-success": "#FFFFFF", "@color-bi-background-toast-warning": "#FFFFFF", diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index 9109a9a4e..bce738ef3 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -27,7 +27,7 @@ BI.Popover = BI.inherit(BI.Widget, { footerHeight: 44, closable: true, // BI-40839 是否显示右上角的关闭按钮 bodyHgap: BI.SIZE_CONSANTS.H_GAP_SIZE, - bodyTgap: 10 + bodyTgap: BI.SIZE_CONSANTS.V_GAP_SIZE }; }, @@ -109,10 +109,10 @@ BI.Popover = BI.inherit(BI.Widget, { }, items: [{ el: o.body - }] - }, - hgap: o.bodyHgap, - tgap: o.bodyTgap + }], + hgap: o.bodyHgap, + tgap: o.bodyTgap + } } : { el: { type: "bi.absolute", @@ -143,7 +143,6 @@ BI.Popover = BI.inherit(BI.Widget, { } return BI.extend({ - type: o.logic.dynamic ? "bi.vertical" : "bi.vtape", items: items, width: this._getSuitableWidth(size.width) }, o.logic.dynamic ? { diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 6c7b3994d..7e7e4e91c 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -83,7 +83,7 @@ //toast .font(toast-error-font, @font-tip-error, @color-bi-color-toast-error); -.font(toast-success-font, @font-tip-success, @color-bi-color-toast-error); +.font(toast-success-font, @font-tip-success, @color-bi-color-toast-success); .font(toast-warning-font, @font-tip-warning, @color-bi-color-toast-warning); .font(toast-message-font, @font-tip-message, @color-bi-color-toast-normal);