From e2f50a27034da986ccfc64594ae2d3be5ef63bc5 Mon Sep 17 00:00:00 2001 From: Young Date: Wed, 20 Jun 2018 14:05:10 +0800 Subject: [PATCH] =?UTF-8?q?BI-24431=E3=80=90=E8=A7=86=E8=A7=89=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E3=80=91FineUI=E9=97=AE=E9=A2=98-=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/foundation/message.js | 2 -- src/base/layer/layer.popover.js | 9 +++++---- src/css/base/foundation/bi.css | 4 ++-- src/less/base/foundation/bi.message.less | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/base/foundation/message.js b/src/base/foundation/message.js index 82b05e6a0..ef199900f 100644 --- a/src/base/foundation/message.js +++ b/src/base/foundation/message.js @@ -77,7 +77,6 @@ $.extend(BI, { el: { type: "bi.button", text: BI.i18nText("BI-Basic_Cancel"), - height: 30, level: "ignore", handler: function () { close(); @@ -92,7 +91,6 @@ $.extend(BI, { el: { type: "bi.button", text: BI.i18nText("BI-Basic_OK"), - height: 30, handler: function () { close(); if (BI.isFunction(callback)) { diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index cbbc64b19..18f13d2cf 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -9,7 +9,8 @@ BI.Popover = BI.inherit(BI.Widget, { SMALL: "small", NORMAL: "normal", BIG: "big" - } + }, + HEADER_HEIGHT: 40 }, _defaultConfig: function () { @@ -56,7 +57,7 @@ BI.Popover = BI.inherit(BI.Widget, { items: [{ el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : { type: "bi.label", - height: 36, + height: this._constant.HEADER_HEIGHT, text: o.header, title: o.header, textAlign: "left" @@ -72,7 +73,7 @@ BI.Popover = BI.inherit(BI.Widget, { el: { type: "bi.icon_button", cls: "bi-message-close close-font", - height: 36, + height: this._constant.HEADER_HEIGHT, handler: function () { self.close(); } @@ -81,7 +82,7 @@ BI.Popover = BI.inherit(BI.Widget, { } } }, - height: 36 + height: this._constant.HEADER_HEIGHT }, center: { el: { diff --git a/src/css/base/foundation/bi.css b/src/css/base/foundation/bi.css index ed7cdec87..fb0c4433f 100644 --- a/src/css/base/foundation/bi.css +++ b/src/css/base/foundation/bi.css @@ -1,5 +1,5 @@ .bi-message-title { - font-size: 16px; + font-size: 14px; cursor: pointer; } .bi-message-text { @@ -15,7 +15,7 @@ font-size: 16px; } .bi-message-close { - font-size: 25px; + font-size: 16px; } .bi-message-animate { -webkit-transition: opacity 0.3s, transform 0.4s, -webkit-transform 0.4s; diff --git a/src/less/base/foundation/bi.message.less b/src/less/base/foundation/bi.message.less index 53692cbe1..5da4a752c 100644 --- a/src/less/base/foundation/bi.message.less +++ b/src/less/base/foundation/bi.message.less @@ -1,7 +1,7 @@ @import "../../index"; .bi-message-title { - font-size: 16px; + font-size: 14px; cursor: pointer; } @@ -15,7 +15,7 @@ } .bi-message-close { - font-size: 25px; + font-size: 16px; } .bi-message-animate {