Merge branch 'master' of ssh://cloud.finedevelop.com:7999/visual/fineui

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js

dist/base.css

@@ -829,6 +829,14 @@ body .bi-button,
   border-radius: 2px;
   border: 1px solid #3685f2;
   background-color: #3685f2;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
   text-align: center;
   vertical-align: middle;
   cursor: pointer;

dist/bundle.css

@@ -2783,6 +2783,14 @@ body .bi-button,
   border-radius: 2px;
   border: 1px solid #3685f2;
   background-color: #3685f2;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
   text-align: center;
   vertical-align: middle;
   cursor: pointer;

dist/fineui.css

@@ -2783,6 +2783,14 @@ body .bi-button,
   border-radius: 2px;
   border: 1px solid #3685f2;
   background-color: #3685f2;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
   text-align: center;
   vertical-align: middle;
   cursor: pointer;

src/css/base/single/button/button.css

@@ -5,6 +5,14 @@ body .bi-button,
   border-radius: 2px;
   border: 1px solid #3685f2;
   background-color: #3685f2;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
   text-align: center;
   vertical-align: middle;
   cursor: pointer;

src/less/base/single/button/button.less

@@ -4,6 +4,7 @@ body .bi-button, #body .bi-button {
   .border-radius(2px);
   border: 1px solid @color-bi-border-highlight;
   background-color: @color-bi-background-highlight;
+  .box-sizing(border-box);
   text-align: center;
   vertical-align: middle;
   cursor: pointer;