Browse Source

Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui

# Conflicts:
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
windy 6 years ago
parent
commit
07581ca91d
  1. 2
      dist/2.0/fineui.css
  2. 2
      dist/2.0/fineui.min.css
  3. 2
      dist/base.css
  4. 2
      dist/bundle.css
  5. 2
      dist/bundle.min.css
  6. 2
      dist/fineui.css
  7. 2
      dist/fineui.min.css
  8. 2
      src/css/base/combo/combo.css
  9. 2
      src/less/base/combo/combo.bubble.less

2
dist/2.0/fineui.css vendored

@ -2556,6 +2556,8 @@ textarea {
position: fixed !important;
line-height: 0;
z-index: 10000000;
background-color: rgba(255, 255, 255, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff);
}
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/base.css vendored

@ -400,6 +400,8 @@
position: fixed !important;
line-height: 0;
z-index: 10000000;
background-color: rgba(255, 255, 255, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff);
}
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;

2
dist/bundle.css vendored

@ -2556,6 +2556,8 @@ textarea {
position: fixed !important;
line-height: 0;
z-index: 10000000;
background-color: rgba(255, 255, 255, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff);
}
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

@ -2556,6 +2556,8 @@ textarea {
position: fixed !important;
line-height: 0;
z-index: 10000000;
background-color: rgba(255, 255, 255, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff);
}
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
src/css/base/combo/combo.css

@ -2,6 +2,8 @@
position: fixed !important;
line-height: 0;
z-index: 10000000;
background-color: rgba(255, 255, 255, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff);
}
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;

2
src/less/base/combo/combo.bubble.less

@ -6,6 +6,8 @@
// 消除祖先节点设置的line-height:normal对空白节点的行高影响
line-height: 0;
.z-index-layer(@zIndex-popup);
// ie10一下无背景色会鼠标穿透
.background-color(@background-color-default, 0);
}
& .bubble-combo-triangle-left {
z-index: 1;

Loading…
Cancel
Save