Permalink
Browse files

merge form gitlab master

  • Loading branch information...
2 parents 291c1ba + 3b5d45c commit e84de73c36a5b5cc95e40985a1642fbe7c574033 @zengyue zengyue committed with zengyue Jun 5, 2014
Showing with 14 additions and 13 deletions.
  1. +1 −1 assets/css/bs3/dpl-min.css
  2. +3 −3 assets/css/bs3/dpl.css
  3. +2 −1 build/bui.js
  4. +1 −1 build/css/bs3/dpl-min.css
  5. +3 −3 build/css/bs3/dpl.css
  6. +2 −1 build/mask.js
  7. +1 −1 src/mask/mask.js
  8. +1 −2 test/specs/mask-spec.js
Oops, something went wrong.
@@ -1683,7 +1683,7 @@ fieldset[disabled] .x-icon-question.active {
background-position: 0 -72px;
}
.icon-map-marker {
- background-position: -23.99999999px -72px;
+ background-position: -24px -72px;
}
.icon-adjust {
background-position: -48px -72px;
@@ -1872,7 +1872,7 @@ fieldset[disabled] .x-icon-question.active {
background-position: -72px -144px;
}
.icon-thumbs-up {
- background-position: -96px -144px;
+ background-position: -95.99999999px -144px;
}
.icon-thumbs-down {
background-position: -120px -144px;
@@ -1968,7 +1968,7 @@ fieldset[disabled] .x-icon-question.active {
background-position: -1px -273px;
}
.icon-caret-right-down {
- background-position: -1px -264px;
+ background-position: -1px -263.99999999px;
}
.breadcrumb {
padding: 7px 14px;
View
@@ -24128,7 +24128,8 @@ define('bui/mask/mask',['bui/common'],function (require) {
});
return Mask;
-});/**
+});
+/**
* @fileOverview \u52a0\u8f7d\u6570\u636e\u65f6\u5c4f\u853d\u5c42
* @ignore
*/
Oops, something went wrong.
@@ -1683,7 +1683,7 @@ fieldset[disabled] .x-icon-question.active {
background-position: 0 -72px;
}
.icon-map-marker {
- background-position: -23.99999999px -72px;
+ background-position: -24px -72px;
}
.icon-adjust {
background-position: -48px -72px;
@@ -1872,7 +1872,7 @@ fieldset[disabled] .x-icon-question.active {
background-position: -72px -144px;
}
.icon-thumbs-up {
- background-position: -96px -144px;
+ background-position: -95.99999999px -144px;
}
.icon-thumbs-down {
background-position: -120px -144px;
@@ -1968,7 +1968,7 @@ fieldset[disabled] .x-icon-question.active {
background-position: -1px -273px;
}
.icon-caret-right-down {
- background-position: -1px -264px;
+ background-position: -1px -263.99999999px;
}
.breadcrumb {
padding: 7px 14px;
View
@@ -118,7 +118,8 @@ define('bui/mask/mask',['bui/common'],function (require) {
});
return Mask;
-});/**
+});
+/**
* @fileOverview 加载数据时屏蔽层
* @ignore
*/
View
@@ -108,4 +108,4 @@ define('bui/mask/mask',['bui/common'],function (require) {
});
return Mask;
-});
+});
@@ -36,7 +36,6 @@ BUI.use('bui/mask',function () {
Mask.unmaskElement('body');
expect($('body').find('.bui-ext-mask').length).toBe(0);
});
-
});
describe('加载数据,屏蔽元素',function(){
@@ -63,4 +62,4 @@ BUI.use('bui/mask',function () {
});
});
-});
+});

0 comments on commit e84de73

Please sign in to comment.