Browse Source

Pull request #2519: KERNEL-9882 popover的gap && toast成功色

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'a664e9ae40ee29d8a473b830a85142e8b83ea83d':
  再更新
  更新
  KERNEL-9882 popover的gap && toast成功色
es6
windy 3 years ago
parent
commit
6a88ac509f
  1. 3
      bi.lessconfig.json
  2. 7
      src/base/layer/layer.popover.js
  3. 2
      src/less/resource/font.less

3
bi.lessconfig.json

@ -8,7 +8,7 @@
"@color-light-gray": "#ECEEF3", "@color-light-gray": "#ECEEF3",
"@color-light-gray-theme-dark": "#292F45", "@color-light-gray-theme-dark": "#292F45",
"@border-color-dark-line": "#2E3A4D", "@border-color-dark-line": "#2E3A4D",
"@color-sliver-theme-dark": "363E55", "@color-sliver-theme-dark": "#363E55",
"@border-color-disabled": "#E7E8EB", "@border-color-disabled": "#E7E8EB",
"@color-bi-background-active-radio": "transparent", "@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": "#D0D4DA",
"@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
"@color-bi-background-tooltip-success": "#2E3A4D", "@color-bi-background-tooltip-success": "#2E3A4D",
"@color-bi-text-header-background": "#647185",
"@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-border-tooltip-success": "#2E3A4D",
"@color-bi-background-toast-success": "#FFFFFF", "@color-bi-background-toast-success": "#FFFFFF",
"@color-bi-background-toast-warning": "#FFFFFF", "@color-bi-background-toast-warning": "#FFFFFF",

7
src/base/layer/layer.popover.js

@ -27,7 +27,7 @@ BI.Popover = BI.inherit(BI.Widget, {
footerHeight: 44, footerHeight: 44,
closable: true, // BI-40839 是否显示右上角的关闭按钮 closable: true, // BI-40839 是否显示右上角的关闭按钮
bodyHgap: BI.SIZE_CONSANTS.H_GAP_SIZE, 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: [{ items: [{
el: o.body el: o.body
}] }],
},
hgap: o.bodyHgap, hgap: o.bodyHgap,
tgap: o.bodyTgap tgap: o.bodyTgap
}
} : { } : {
el: { el: {
type: "bi.absolute", type: "bi.absolute",
@ -143,7 +143,6 @@ BI.Popover = BI.inherit(BI.Widget, {
} }
return BI.extend({ return BI.extend({
type: o.logic.dynamic ? "bi.vertical" : "bi.vtape",
items: items, items: items,
width: this._getSuitableWidth(size.width) width: this._getSuitableWidth(size.width)
}, o.logic.dynamic ? { }, o.logic.dynamic ? {

2
src/less/resource/font.less

@ -83,7 +83,7 @@
//toast //toast
.font(toast-error-font, @font-tip-error, @color-bi-color-toast-error); .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-warning-font, @font-tip-warning, @color-bi-color-toast-warning);
.font(toast-message-font, @font-tip-message, @color-bi-color-toast-normal); .font(toast-message-font, @font-tip-message, @color-bi-color-toast-normal);

Loading…
Cancel
Save