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

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

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