Browse Source

Merge pull request #454 in VISUAL/fineui from ~YOUNG/fineui:master to master

* commit 'e2f50a27034da986ccfc64594ae2d3be5ef63bc5':
  BI-24431【视觉验收】FineUI问题-弹窗
es6
windy 7 years ago
parent
commit
6d9fb72a8e
  1. 2
      src/base/foundation/message.js
  2. 9
      src/base/layer/layer.popover.js
  3. 4
      src/css/base/foundation/bi.css
  4. 4
      src/less/base/foundation/bi.message.less

2
src/base/foundation/message.js

@ -77,7 +77,6 @@ $.extend(BI, {
el: { el: {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
height: 30,
level: "ignore", level: "ignore",
handler: function () { handler: function () {
close(); close();
@ -92,7 +91,6 @@ $.extend(BI, {
el: { el: {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
height: 30,
handler: function () { handler: function () {
close(); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {

9
src/base/layer/layer.popover.js

@ -9,7 +9,8 @@ BI.Popover = BI.inherit(BI.Widget, {
SMALL: "small", SMALL: "small",
NORMAL: "normal", NORMAL: "normal",
BIG: "big" BIG: "big"
} },
HEADER_HEIGHT: 40
}, },
_defaultConfig: function () { _defaultConfig: function () {
@ -56,7 +57,7 @@ BI.Popover = BI.inherit(BI.Widget, {
items: [{ items: [{
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : { el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : {
type: "bi.label", type: "bi.label",
height: 36, height: this._constant.HEADER_HEIGHT,
text: o.header, text: o.header,
title: o.header, title: o.header,
textAlign: "left" textAlign: "left"
@ -72,7 +73,7 @@ BI.Popover = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: 36, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
@ -81,7 +82,7 @@ BI.Popover = BI.inherit(BI.Widget, {
} }
} }
}, },
height: 36 height: this._constant.HEADER_HEIGHT
}, },
center: { center: {
el: { el: {

4
src/css/base/foundation/bi.css

@ -1,5 +1,5 @@
.bi-message-title { .bi-message-title {
font-size: 16px; font-size: 14px;
cursor: pointer; cursor: pointer;
} }
.bi-message-text { .bi-message-text {
@ -15,7 +15,7 @@
font-size: 16px; font-size: 16px;
} }
.bi-message-close { .bi-message-close {
font-size: 25px; font-size: 16px;
} }
.bi-message-animate { .bi-message-animate {
-webkit-transition: opacity 0.3s, transform 0.4s, -webkit-transform 0.4s; -webkit-transition: opacity 0.3s, transform 0.4s, -webkit-transform 0.4s;

4
src/less/base/foundation/bi.message.less

@ -1,7 +1,7 @@
@import "../../index"; @import "../../index";
.bi-message-title { .bi-message-title {
font-size: 16px; font-size: 14px;
cursor: pointer; cursor: pointer;
} }
@ -15,7 +15,7 @@
} }
.bi-message-close { .bi-message-close {
font-size: 25px; font-size: 16px;
} }
.bi-message-animate { .bi-message-animate {

Loading…
Cancel
Save