Merge branch 'master' into antd-3.0

components/card/style/index.less

@@ -71,28 +71,6 @@
     .clearfix;
   }
 
-  &-loading &-body {
-    user-select: none;
-    padding: 0;
-  }
-
-  &-loading-content {
-    padding: @card-padding-base;
-    p {
-      margin: 0;
-    }
-  }
-
-  &-loading-block {
-    display: inline-block;
-    margin: 5px 2% 0 0;
-    height: 14px;
-    border-radius: @border-radius-sm;
-    background: linear-gradient(90deg, rgba(207, 216, 220, .2), rgba(207, 216, 220, .4), rgba(207, 216, 220, .2));
-	  animation: card-loading 1.4s ease infinite;
-    background-size: 600% 600%;
-  }
-
   &-contain-grid &-body {
     margin: -1px 0 0 -1px;
     padding: 0;
@@ -245,6 +223,28 @@
       color: @text-color-secondary;
     }
   }
+
+  &-loading &-body {
+    user-select: none;
+    padding: 0;
+  }
+
+  &-loading-content {
+    padding: @card-padding-base;
+    p {
+      margin: 0;
+    }
+  }
+
+  &-loading-block {
+    display: inline-block;
+    margin: 5px 2% 0 0;
+    height: 14px;
+    border-radius: @border-radius-sm;
+    background: linear-gradient(90deg, rgba(207, 216, 220, .2), rgba(207, 216, 220, .4), rgba(207, 216, 220, .2));
+    animation: card-loading 1.4s ease infinite;
+    background-size: 600% 600%;
+  }
 }
 
 @keyframes card-loading {