From 05382ec9d6a96765ac60b8deb20d66c7018a6b32 Mon Sep 17 00:00:00 2001 From: Young Date: Tue, 21 Aug 2018 17:50:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-28955=20pane=E6=B7=BB=E5=8A=A0=E9=80=8F?= =?UTF-8?q?=E6=98=8E=E8=83=8C=E6=99=AF=E5=85=BC=E5=AE=B9ie10=E9=81=AE?= =?UTF-8?q?=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/pane.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/less/base/pane.less b/src/less/base/pane.less index ed0194c8a1..fa9dcf2fc6 100644 --- a/src/less/base/pane.less +++ b/src/less/base/pane.less @@ -2,4 +2,5 @@ .bi-pane { min-height: 25px; + .background-color(@color-bi-background-normal, 0); } \ No newline at end of file From a5f33c004ee6f8c4d8863aee28989558d7f21f61 Mon Sep 17 00:00:00 2001 From: Young Date: Tue, 21 Aug 2018 17:52:02 +0800 Subject: [PATCH 2/2] update --- dist/base.css | 2 ++ dist/bundle.css | 2 ++ dist/bundle.js | 44 +++++++++++++++++++++---------------------- dist/core.js | 44 +++++++++++++++++++++---------------------- dist/fineui.css | 2 ++ dist/fineui.js | 44 +++++++++++++++++++++---------------------- src/css/base/pane.css | 2 ++ 7 files changed, 74 insertions(+), 66 deletions(-) diff --git a/dist/base.css b/dist/base.css index 691fcd29b7..cb28b9328d 100644 --- a/dist/base.css +++ b/dist/base.css @@ -653,6 +653,8 @@ } .bi-pane { min-height: 25px; + background-color: rgba(247, 248, 250, 0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } .bi-segment-button { color: #3685f2; diff --git a/dist/bundle.css b/dist/bundle.css index 26fd5e12a0..f03ca980e9 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -2607,6 +2607,8 @@ textarea { } .bi-pane { min-height: 25px; + background-color: rgba(247, 248, 250, 0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } .bi-segment-button { color: #3685f2; diff --git a/dist/bundle.js b/dist/bundle.js index 9aee919039..bd6360a60f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -9408,30 +9408,30 @@ jQuery.fn.offset = function( options ) { // If we don't have gBCR, just use 0,0 rather than error // BlackBerry 5, iOS 3 (original iPhone) - // if ( typeof elem.getBoundingClientRect !== core_strundefined ) { - // box = elem.getBoundingClientRect(); - // } - // 解决transform下的offset问题 - var el = elem, - offsetLeft = 0, - offsetTop = 0; - - do{ - offsetLeft += el.offsetLeft; - offsetTop += el.offsetTop; - el = el.offsetParent; - } while( el ); - - var elm = elem; - do{ - offsetLeft -= elm.scrollLeft || 0; - offsetTop -= elm.scrollTop || 0; - elm = elm.parentNode; - } while( elm ); + if ( typeof elem.getBoundingClientRect !== core_strundefined ) { + box = elem.getBoundingClientRect(); + } + // 解决transform下的offset问题(先恢复) + // var el = elem, + // offsetLeft = 0, + // offsetTop = 0; + + // do{ + // offsetLeft += el.offsetLeft; + // offsetTop += el.offsetTop; + // el = el.offsetParent; + // } while( el ); + + // var elm = elem; + // do{ + // offsetLeft -= elm.scrollLeft || 0; + // offsetTop -= elm.scrollTop || 0; + // elm = elm.parentNode; + // } while( elm ); win = getWindow( doc ); return { - top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), - left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) + top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), + left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) }; }; diff --git a/dist/core.js b/dist/core.js index 45096b34e7..b0893c116e 100644 --- a/dist/core.js +++ b/dist/core.js @@ -9408,30 +9408,30 @@ jQuery.fn.offset = function( options ) { // If we don't have gBCR, just use 0,0 rather than error // BlackBerry 5, iOS 3 (original iPhone) - // if ( typeof elem.getBoundingClientRect !== core_strundefined ) { - // box = elem.getBoundingClientRect(); - // } - // 解决transform下的offset问题 - var el = elem, - offsetLeft = 0, - offsetTop = 0; - - do{ - offsetLeft += el.offsetLeft; - offsetTop += el.offsetTop; - el = el.offsetParent; - } while( el ); - - var elm = elem; - do{ - offsetLeft -= elm.scrollLeft || 0; - offsetTop -= elm.scrollTop || 0; - elm = elm.parentNode; - } while( elm ); + if ( typeof elem.getBoundingClientRect !== core_strundefined ) { + box = elem.getBoundingClientRect(); + } + // 解决transform下的offset问题(先恢复) + // var el = elem, + // offsetLeft = 0, + // offsetTop = 0; + + // do{ + // offsetLeft += el.offsetLeft; + // offsetTop += el.offsetTop; + // el = el.offsetParent; + // } while( el ); + + // var elm = elem; + // do{ + // offsetLeft -= elm.scrollLeft || 0; + // offsetTop -= elm.scrollTop || 0; + // elm = elm.parentNode; + // } while( elm ); win = getWindow( doc ); return { - top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), - left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) + top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), + left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) }; }; diff --git a/dist/fineui.css b/dist/fineui.css index 0e3c108da3..14e55e4bd8 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -2607,6 +2607,8 @@ textarea { } .bi-pane { min-height: 25px; + background-color: rgba(247, 248, 250, 0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } .bi-segment-button { color: #3685f2; diff --git a/dist/fineui.js b/dist/fineui.js index 860c177118..1d53b88b90 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -9647,30 +9647,30 @@ jQuery.fn.offset = function( options ) { // If we don't have gBCR, just use 0,0 rather than error // BlackBerry 5, iOS 3 (original iPhone) - // if ( typeof elem.getBoundingClientRect !== core_strundefined ) { - // box = elem.getBoundingClientRect(); - // } - // 解决transform下的offset问题 - var el = elem, - offsetLeft = 0, - offsetTop = 0; - - do{ - offsetLeft += el.offsetLeft; - offsetTop += el.offsetTop; - el = el.offsetParent; - } while( el ); - - var elm = elem; - do{ - offsetLeft -= elm.scrollLeft || 0; - offsetTop -= elm.scrollTop || 0; - elm = elm.parentNode; - } while( elm ); + if ( typeof elem.getBoundingClientRect !== core_strundefined ) { + box = elem.getBoundingClientRect(); + } + // 解决transform下的offset问题(先恢复) + // var el = elem, + // offsetLeft = 0, + // offsetTop = 0; + + // do{ + // offsetLeft += el.offsetLeft; + // offsetTop += el.offsetTop; + // el = el.offsetParent; + // } while( el ); + + // var elm = elem; + // do{ + // offsetLeft -= elm.scrollLeft || 0; + // offsetTop -= elm.scrollTop || 0; + // elm = elm.parentNode; + // } while( elm ); win = getWindow( doc ); return { - top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), - left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) + top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), + left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) }; }; diff --git a/src/css/base/pane.css b/src/css/base/pane.css index 530e82a621..a2d0eed25e 100644 --- a/src/css/base/pane.css +++ b/src/css/base/pane.css @@ -1,3 +1,5 @@ .bi-pane { min-height: 25px; + background-color: rgba(247, 248, 250, 0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); }