Merge remote-tracking branch 'origin/develop' into beta

@@ -146,12 +146,13 @@ function changeSizeChosed(newSizeIndex) {
                 $curSizeBlock = $(sizes[i]);
                 queryString = '#' + $curSizeBlock.data('name');
                 curColorIndex = $(queryString).data('index');
-            }
-        }
-
                 $curSizeBlock.addClass('chosed');
                 return $curSizeBlock.data('num');
             }
+        }
+        $curSizeBlock = null;
+        return 0;
+    }
     return 0;
 }
 

@@ -127,7 +127,7 @@
 
             .cancel-btn {
                 display: inline;
-                font-size: 32rem / $pxConvertRem;
+                font-size: 28rem / $pxConvertRem;
                 vertical-align: middle;
             }