Merge branch 'master' into gh-pages

fa49d3bc · Gabriele Cirulli · fe04a69b · bf1ba513 · fa49d3bc · fa49d3bc
显示空白变更内容
内联并排

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
@@ -145,6 +145,7 @@ hr {
  -webkit-touch-callout: none;
  -webkit-user-select: none;
  -moz-user-select: none;
+  -ms-user-select: none;
  background: #bbada0;
  border-radius: 6px;
  width: 500px;
@@ -555,6 +556,7 @@ hr {
    -webkit-touch-callout: none;
    -webkit-user-select: none;
    -moz-user-select: none;
+    -ms-user-select: none;
    background: #bbada0;
    border-radius: 6px;
    width: 280px;

--- a/style/main.scss
+++ b/style/main.scss
@@ -178,6 +178,7 @@ hr {
    -webkit-touch-callout: none;
    -webkit-user-select: none;
    -moz-user-select: none;
+    -ms-user-select: none;

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