Merge branch 'master' into gh-pages

5110b255 · Gabriele Cirulli · 9efe9dab · 878098f8 · 5110b255 · 5110b255
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

style/main.css style/main.css +2 -0

style/main.scss style/main.scss +1 -0

未找到文件。
--- a/style/main.css
+++ b/style/main.css
@@ -148,6 +148,7 @@ hr {
  -moz-user-select: none;
  -ms-user-select: none;
  -ms-touch-action: none;
+  touch-action: none;
  background: #bbada0;
  border-radius: 6px;
  width: 500px;
@@ -560,6 +561,7 @@ hr {
    -moz-user-select: none;
    -ms-user-select: none;
    -ms-touch-action: none;
+    touch-action: none;
    background: #bbada0;
    border-radius: 6px;
    width: 280px;

--- a/style/main.scss
+++ b/style/main.scss
@@ -183,6 +183,7 @@ hr {
    -ms-user-select: none;

    -ms-touch-action: none;
+    touch-action: none;

    background: $game-container-background;
    border-radius: $tile-border-radius * 2;