From f58a5f054108c0e0ca3cf2bee3891982a9e92f5e Mon Sep 17 00:00:00 2001 From: Rick Byers Date: Wed, 17 Oct 2018 02:16:27 +0000 Subject: [PATCH 1/3] Disable Chrome's pull-to-refresh Fixes #478 --- style/main.css | 208 +++++++++++++++++++++++------------------------- style/main.scss | 5 ++ 2 files changed, 104 insertions(+), 109 deletions(-) diff --git a/style/main.css b/style/main.css index ea3cb19fca..cf68252798 100644 --- a/style/main.css +++ b/style/main.css @@ -3,10 +3,13 @@ html, body { margin: 0; padding: 0; background: #faf8ef; - color: #776e65; + color: #776E65; font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif; font-size: 18px; } +html { + overscroll-behavior: contain; } + body { margin: 80px 0; } @@ -22,27 +25,24 @@ h1.title { display: block; float: left; } -@-webkit-keyframes move-up { +@-webkit-keyframes $animation-name { 0% { top: 25px; opacity: 1; } - 100% { top: -50px; opacity: 0; } } -@-moz-keyframes move-up { +@-moz-keyframes $animation-name { 0% { top: 25px; opacity: 1; } - 100% { top: -50px; opacity: 0; } } -@keyframes move-up { +@keyframes $animation-name { 0% { top: 25px; opacity: 1; } - 100% { top: -50px; opacity: 0; } } @@ -101,7 +101,7 @@ p { line-height: 1.65; } a { - color: #776e65; + color: #776E65; font-weight: bold; text-decoration: underline; cursor: pointer; } @@ -119,22 +119,19 @@ hr { width: 500px; margin: 0 auto; } -@-webkit-keyframes fade-in { +@-webkit-keyframes $animation-name { 0% { opacity: 0; } - 100% { opacity: 1; } } -@-moz-keyframes fade-in { +@-moz-keyframes $animation-name { 0% { opacity: 0; } - 100% { opacity: 1; } } -@keyframes fade-in { +@keyframes $animation-name { 0% { opacity: 0; } - 100% { opacity: 1; } } .game-container { @@ -332,23 +329,23 @@ hr { background: #eee4da; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); } .tile.tile-4 .tile-inner { - background: #ede0c8; + background: #eee1c9; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); } .tile.tile-8 .tile-inner { color: #f9f6f2; - background: #f2b179; } + background: #f3b27a; } .tile.tile-16 .tile-inner { color: #f9f6f2; - background: #f59563; } + background: #f69664; } .tile.tile-32 .tile-inner { color: #f9f6f2; - background: #f67c5f; } + background: #f77c5f; } .tile.tile-64 .tile-inner { color: #f9f6f2; - background: #f65e3b; } + background: #f75f3b; } .tile.tile-128 .tile-inner { color: #f9f6f2; - background: #edcf72; + background: #edd073; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286); font-size: 45px; } @media screen and (max-width: 520px) { @@ -356,7 +353,7 @@ hr { font-size: 25px; } } .tile.tile-256 .tile-inner { color: #f9f6f2; - background: #edcc61; + background: #edcc62; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048); font-size: 45px; } @media screen and (max-width: 520px) { @@ -364,7 +361,7 @@ hr { font-size: 25px; } } .tile.tile-512 .tile-inner { color: #f9f6f2; - background: #edc850; + background: #edc950; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381); font-size: 45px; } @media screen and (max-width: 520px) { @@ -388,48 +385,45 @@ hr { font-size: 15px; } } .tile.tile-super .tile-inner { color: #f9f6f2; - background: #3c3a32; + background: #3c3a33; font-size: 30px; } @media screen and (max-width: 520px) { .tile.tile-super .tile-inner { font-size: 10px; } } -@-webkit-keyframes appear { +@-webkit-keyframes $animation-name { 0% { opacity: 0; -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 100% { opacity: 1; -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@-moz-keyframes appear { +@-moz-keyframes $animation-name { 0% { opacity: 0; -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 100% { opacity: 1; -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@keyframes appear { +@keyframes $animation-name { 0% { opacity: 0; -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 100% { opacity: 1; -webkit-transform: scale(1); @@ -444,55 +438,49 @@ hr { -moz-animation-fill-mode: backwards; animation-fill-mode: backwards; } -@-webkit-keyframes pop { +@-webkit-keyframes $animation-name { 0% { -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 50% { -webkit-transform: scale(1.2); -moz-transform: scale(1.2); -ms-transform: scale(1.2); transform: scale(1.2); } - 100% { -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@-moz-keyframes pop { +@-moz-keyframes $animation-name { 0% { -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 50% { -webkit-transform: scale(1.2); -moz-transform: scale(1.2); -ms-transform: scale(1.2); transform: scale(1.2); } - 100% { -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@keyframes pop { +@keyframes $animation-name { 0% { -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 50% { -webkit-transform: scale(1.2); -moz-transform: scale(1.2); -ms-transform: scale(1.2); transform: scale(1.2); } - 100% { -webkit-transform: scale(1); -moz-transform: scale(1); @@ -571,9 +559,9 @@ hr { margin-top: 2px; } .game-container { - margin-top: 17px; + margin-top: 40px; position: relative; - padding: 10px; + padding: 15px; cursor: default; -webkit-touch-callout: none; -ms-touch-callout: none; @@ -584,8 +572,8 @@ hr { touch-action: none; background: #bbada0; border-radius: 6px; - width: 280px; - height: 280px; + width: 500px; + height: 500px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } @@ -639,7 +627,7 @@ hr { z-index: 1; } .grid-row { - margin-bottom: 10px; } + margin-bottom: 15px; } .grid-row:last-child { margin-bottom: 0; } .grid-row:after { @@ -648,9 +636,9 @@ hr { clear: both; } .grid-cell { - width: 57.5px; - height: 57.5px; - margin-right: 10px; + width: 106.25px; + height: 106.25px; + margin-right: 15px; float: left; border-radius: 3px; background: rgba(238, 228, 218, 0.35); } @@ -662,89 +650,89 @@ hr { z-index: 2; } .tile, .tile .tile-inner { - width: 58px; - height: 58px; - line-height: 58px; } + width: 107px; + height: 107px; + line-height: 107px; } .tile.tile-position-1-1 { -webkit-transform: translate(0px, 0px); -moz-transform: translate(0px, 0px); -ms-transform: translate(0px, 0px); transform: translate(0px, 0px); } .tile.tile-position-1-2 { - -webkit-transform: translate(0px, 67px); - -moz-transform: translate(0px, 67px); - -ms-transform: translate(0px, 67px); - transform: translate(0px, 67px); } + -webkit-transform: translate(0px, 121px); + -moz-transform: translate(0px, 121px); + -ms-transform: translate(0px, 121px); + transform: translate(0px, 121px); } .tile.tile-position-1-3 { - -webkit-transform: translate(0px, 135px); - -moz-transform: translate(0px, 135px); - -ms-transform: translate(0px, 135px); - transform: translate(0px, 135px); } + -webkit-transform: translate(0px, 242px); + -moz-transform: translate(0px, 242px); + -ms-transform: translate(0px, 242px); + transform: translate(0px, 242px); } .tile.tile-position-1-4 { - -webkit-transform: translate(0px, 202px); - -moz-transform: translate(0px, 202px); - -ms-transform: translate(0px, 202px); - transform: translate(0px, 202px); } + -webkit-transform: translate(0px, 363px); + -moz-transform: translate(0px, 363px); + -ms-transform: translate(0px, 363px); + transform: translate(0px, 363px); } .tile.tile-position-2-1 { - -webkit-transform: translate(67px, 0px); - -moz-transform: translate(67px, 0px); - -ms-transform: translate(67px, 0px); - transform: translate(67px, 0px); } + -webkit-transform: translate(121px, 0px); + -moz-transform: translate(121px, 0px); + -ms-transform: translate(121px, 0px); + transform: translate(121px, 0px); } .tile.tile-position-2-2 { - -webkit-transform: translate(67px, 67px); - -moz-transform: translate(67px, 67px); - -ms-transform: translate(67px, 67px); - transform: translate(67px, 67px); } + -webkit-transform: translate(121px, 121px); + -moz-transform: translate(121px, 121px); + -ms-transform: translate(121px, 121px); + transform: translate(121px, 121px); } .tile.tile-position-2-3 { - -webkit-transform: translate(67px, 135px); - -moz-transform: translate(67px, 135px); - -ms-transform: translate(67px, 135px); - transform: translate(67px, 135px); } + -webkit-transform: translate(121px, 242px); + -moz-transform: translate(121px, 242px); + -ms-transform: translate(121px, 242px); + transform: translate(121px, 242px); } .tile.tile-position-2-4 { - -webkit-transform: translate(67px, 202px); - -moz-transform: translate(67px, 202px); - -ms-transform: translate(67px, 202px); - transform: translate(67px, 202px); } + -webkit-transform: translate(121px, 363px); + -moz-transform: translate(121px, 363px); + -ms-transform: translate(121px, 363px); + transform: translate(121px, 363px); } .tile.tile-position-3-1 { - -webkit-transform: translate(135px, 0px); - -moz-transform: translate(135px, 0px); - -ms-transform: translate(135px, 0px); - transform: translate(135px, 0px); } + -webkit-transform: translate(242px, 0px); + -moz-transform: translate(242px, 0px); + -ms-transform: translate(242px, 0px); + transform: translate(242px, 0px); } .tile.tile-position-3-2 { - -webkit-transform: translate(135px, 67px); - -moz-transform: translate(135px, 67px); - -ms-transform: translate(135px, 67px); - transform: translate(135px, 67px); } + -webkit-transform: translate(242px, 121px); + -moz-transform: translate(242px, 121px); + -ms-transform: translate(242px, 121px); + transform: translate(242px, 121px); } .tile.tile-position-3-3 { - -webkit-transform: translate(135px, 135px); - -moz-transform: translate(135px, 135px); - -ms-transform: translate(135px, 135px); - transform: translate(135px, 135px); } + -webkit-transform: translate(242px, 242px); + -moz-transform: translate(242px, 242px); + -ms-transform: translate(242px, 242px); + transform: translate(242px, 242px); } .tile.tile-position-3-4 { - -webkit-transform: translate(135px, 202px); - -moz-transform: translate(135px, 202px); - -ms-transform: translate(135px, 202px); - transform: translate(135px, 202px); } + -webkit-transform: translate(242px, 363px); + -moz-transform: translate(242px, 363px); + -ms-transform: translate(242px, 363px); + transform: translate(242px, 363px); } .tile.tile-position-4-1 { - -webkit-transform: translate(202px, 0px); - -moz-transform: translate(202px, 0px); - -ms-transform: translate(202px, 0px); - transform: translate(202px, 0px); } + -webkit-transform: translate(363px, 0px); + -moz-transform: translate(363px, 0px); + -ms-transform: translate(363px, 0px); + transform: translate(363px, 0px); } .tile.tile-position-4-2 { - -webkit-transform: translate(202px, 67px); - -moz-transform: translate(202px, 67px); - -ms-transform: translate(202px, 67px); - transform: translate(202px, 67px); } + -webkit-transform: translate(363px, 121px); + -moz-transform: translate(363px, 121px); + -ms-transform: translate(363px, 121px); + transform: translate(363px, 121px); } .tile.tile-position-4-3 { - -webkit-transform: translate(202px, 135px); - -moz-transform: translate(202px, 135px); - -ms-transform: translate(202px, 135px); - transform: translate(202px, 135px); } + -webkit-transform: translate(363px, 242px); + -moz-transform: translate(363px, 242px); + -ms-transform: translate(363px, 242px); + transform: translate(363px, 242px); } .tile.tile-position-4-4 { - -webkit-transform: translate(202px, 202px); - -moz-transform: translate(202px, 202px); - -ms-transform: translate(202px, 202px); - transform: translate(202px, 202px); } + -webkit-transform: translate(363px, 363px); + -moz-transform: translate(363px, 363px); + -ms-transform: translate(363px, 363px); + transform: translate(363px, 363px); } .tile .tile-inner { font-size: 35px; } @@ -756,3 +744,5 @@ hr { margin-top: 90px !important; } .game-message .lower { margin-top: 30px !important; } } + +/*# sourceMappingURL=main.css.map */ diff --git a/style/main.scss b/style/main.scss index b0ec8da9cc..4deca03e3b 100644 --- a/style/main.scss +++ b/style/main.scss @@ -31,6 +31,11 @@ html, body { font-size: 18px; } +html { + // Disable pull-to-refresh or other possible swipe side effects + overscroll-behavior: contain; +} + body { margin: 80px 0; } From 071f54ef2fa5c24f62206a3b5771cac58ff1b537 Mon Sep 17 00:00:00 2001 From: Rick Byers Date: Wed, 17 Oct 2018 02:38:03 +0000 Subject: [PATCH 2/3] Fix styles --- style/main.css | 207 +++++++++++++++++++++++++----------------------- style/main.scss | 2 +- 2 files changed, 111 insertions(+), 98 deletions(-) diff --git a/style/main.css b/style/main.css index cf68252798..4a9543c494 100644 --- a/style/main.css +++ b/style/main.css @@ -3,12 +3,12 @@ html, body { margin: 0; padding: 0; background: #faf8ef; - color: #776E65; + color: #776e65; font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif; font-size: 18px; } html { - overscroll-behavior: contain; } + overscroll-behavior: none; } body { margin: 80px 0; } @@ -25,24 +25,27 @@ h1.title { display: block; float: left; } -@-webkit-keyframes $animation-name { +@-webkit-keyframes move-up { 0% { top: 25px; opacity: 1; } + 100% { top: -50px; opacity: 0; } } -@-moz-keyframes $animation-name { +@-moz-keyframes move-up { 0% { top: 25px; opacity: 1; } + 100% { top: -50px; opacity: 0; } } -@keyframes $animation-name { +@keyframes move-up { 0% { top: 25px; opacity: 1; } + 100% { top: -50px; opacity: 0; } } @@ -101,7 +104,7 @@ p { line-height: 1.65; } a { - color: #776E65; + color: #776e65; font-weight: bold; text-decoration: underline; cursor: pointer; } @@ -119,19 +122,22 @@ hr { width: 500px; margin: 0 auto; } -@-webkit-keyframes $animation-name { +@-webkit-keyframes fade-in { 0% { opacity: 0; } + 100% { opacity: 1; } } -@-moz-keyframes $animation-name { +@-moz-keyframes fade-in { 0% { opacity: 0; } + 100% { opacity: 1; } } -@keyframes $animation-name { +@keyframes fade-in { 0% { opacity: 0; } + 100% { opacity: 1; } } .game-container { @@ -329,23 +335,23 @@ hr { background: #eee4da; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); } .tile.tile-4 .tile-inner { - background: #eee1c9; + background: #ede0c8; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); } .tile.tile-8 .tile-inner { color: #f9f6f2; - background: #f3b27a; } + background: #f2b179; } .tile.tile-16 .tile-inner { color: #f9f6f2; - background: #f69664; } + background: #f59563; } .tile.tile-32 .tile-inner { color: #f9f6f2; - background: #f77c5f; } + background: #f67c5f; } .tile.tile-64 .tile-inner { color: #f9f6f2; - background: #f75f3b; } + background: #f65e3b; } .tile.tile-128 .tile-inner { color: #f9f6f2; - background: #edd073; + background: #edcf72; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286); font-size: 45px; } @media screen and (max-width: 520px) { @@ -353,7 +359,7 @@ hr { font-size: 25px; } } .tile.tile-256 .tile-inner { color: #f9f6f2; - background: #edcc62; + background: #edcc61; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048); font-size: 45px; } @media screen and (max-width: 520px) { @@ -361,7 +367,7 @@ hr { font-size: 25px; } } .tile.tile-512 .tile-inner { color: #f9f6f2; - background: #edc950; + background: #edc850; box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381); font-size: 45px; } @media screen and (max-width: 520px) { @@ -385,45 +391,48 @@ hr { font-size: 15px; } } .tile.tile-super .tile-inner { color: #f9f6f2; - background: #3c3a33; + background: #3c3a32; font-size: 30px; } @media screen and (max-width: 520px) { .tile.tile-super .tile-inner { font-size: 10px; } } -@-webkit-keyframes $animation-name { +@-webkit-keyframes appear { 0% { opacity: 0; -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 100% { opacity: 1; -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@-moz-keyframes $animation-name { +@-moz-keyframes appear { 0% { opacity: 0; -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 100% { opacity: 1; -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@keyframes $animation-name { +@keyframes appear { 0% { opacity: 0; -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 100% { opacity: 1; -webkit-transform: scale(1); @@ -438,49 +447,55 @@ hr { -moz-animation-fill-mode: backwards; animation-fill-mode: backwards; } -@-webkit-keyframes $animation-name { +@-webkit-keyframes pop { 0% { -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 50% { -webkit-transform: scale(1.2); -moz-transform: scale(1.2); -ms-transform: scale(1.2); transform: scale(1.2); } + 100% { -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@-moz-keyframes $animation-name { +@-moz-keyframes pop { 0% { -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 50% { -webkit-transform: scale(1.2); -moz-transform: scale(1.2); -ms-transform: scale(1.2); transform: scale(1.2); } + 100% { -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); transform: scale(1); } } -@keyframes $animation-name { +@keyframes pop { 0% { -webkit-transform: scale(0); -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 50% { -webkit-transform: scale(1.2); -moz-transform: scale(1.2); -ms-transform: scale(1.2); transform: scale(1.2); } + 100% { -webkit-transform: scale(1); -moz-transform: scale(1); @@ -559,9 +574,9 @@ hr { margin-top: 2px; } .game-container { - margin-top: 40px; + margin-top: 17px; position: relative; - padding: 15px; + padding: 10px; cursor: default; -webkit-touch-callout: none; -ms-touch-callout: none; @@ -572,8 +587,8 @@ hr { touch-action: none; background: #bbada0; border-radius: 6px; - width: 500px; - height: 500px; + width: 280px; + height: 280px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } @@ -627,7 +642,7 @@ hr { z-index: 1; } .grid-row { - margin-bottom: 15px; } + margin-bottom: 10px; } .grid-row:last-child { margin-bottom: 0; } .grid-row:after { @@ -636,9 +651,9 @@ hr { clear: both; } .grid-cell { - width: 106.25px; - height: 106.25px; - margin-right: 15px; + width: 57.5px; + height: 57.5px; + margin-right: 10px; float: left; border-radius: 3px; background: rgba(238, 228, 218, 0.35); } @@ -650,89 +665,89 @@ hr { z-index: 2; } .tile, .tile .tile-inner { - width: 107px; - height: 107px; - line-height: 107px; } + width: 58px; + height: 58px; + line-height: 58px; } .tile.tile-position-1-1 { -webkit-transform: translate(0px, 0px); -moz-transform: translate(0px, 0px); -ms-transform: translate(0px, 0px); transform: translate(0px, 0px); } .tile.tile-position-1-2 { - -webkit-transform: translate(0px, 121px); - -moz-transform: translate(0px, 121px); - -ms-transform: translate(0px, 121px); - transform: translate(0px, 121px); } + -webkit-transform: translate(0px, 67px); + -moz-transform: translate(0px, 67px); + -ms-transform: translate(0px, 67px); + transform: translate(0px, 67px); } .tile.tile-position-1-3 { - -webkit-transform: translate(0px, 242px); - -moz-transform: translate(0px, 242px); - -ms-transform: translate(0px, 242px); - transform: translate(0px, 242px); } + -webkit-transform: translate(0px, 135px); + -moz-transform: translate(0px, 135px); + -ms-transform: translate(0px, 135px); + transform: translate(0px, 135px); } .tile.tile-position-1-4 { - -webkit-transform: translate(0px, 363px); - -moz-transform: translate(0px, 363px); - -ms-transform: translate(0px, 363px); - transform: translate(0px, 363px); } + -webkit-transform: translate(0px, 202px); + -moz-transform: translate(0px, 202px); + -ms-transform: translate(0px, 202px); + transform: translate(0px, 202px); } .tile.tile-position-2-1 { - -webkit-transform: translate(121px, 0px); - -moz-transform: translate(121px, 0px); - -ms-transform: translate(121px, 0px); - transform: translate(121px, 0px); } + -webkit-transform: translate(67px, 0px); + -moz-transform: translate(67px, 0px); + -ms-transform: translate(67px, 0px); + transform: translate(67px, 0px); } .tile.tile-position-2-2 { - -webkit-transform: translate(121px, 121px); - -moz-transform: translate(121px, 121px); - -ms-transform: translate(121px, 121px); - transform: translate(121px, 121px); } + -webkit-transform: translate(67px, 67px); + -moz-transform: translate(67px, 67px); + -ms-transform: translate(67px, 67px); + transform: translate(67px, 67px); } .tile.tile-position-2-3 { - -webkit-transform: translate(121px, 242px); - -moz-transform: translate(121px, 242px); - -ms-transform: translate(121px, 242px); - transform: translate(121px, 242px); } + -webkit-transform: translate(67px, 135px); + -moz-transform: translate(67px, 135px); + -ms-transform: translate(67px, 135px); + transform: translate(67px, 135px); } .tile.tile-position-2-4 { - -webkit-transform: translate(121px, 363px); - -moz-transform: translate(121px, 363px); - -ms-transform: translate(121px, 363px); - transform: translate(121px, 363px); } + -webkit-transform: translate(67px, 202px); + -moz-transform: translate(67px, 202px); + -ms-transform: translate(67px, 202px); + transform: translate(67px, 202px); } .tile.tile-position-3-1 { - -webkit-transform: translate(242px, 0px); - -moz-transform: translate(242px, 0px); - -ms-transform: translate(242px, 0px); - transform: translate(242px, 0px); } + -webkit-transform: translate(135px, 0px); + -moz-transform: translate(135px, 0px); + -ms-transform: translate(135px, 0px); + transform: translate(135px, 0px); } .tile.tile-position-3-2 { - -webkit-transform: translate(242px, 121px); - -moz-transform: translate(242px, 121px); - -ms-transform: translate(242px, 121px); - transform: translate(242px, 121px); } + -webkit-transform: translate(135px, 67px); + -moz-transform: translate(135px, 67px); + -ms-transform: translate(135px, 67px); + transform: translate(135px, 67px); } .tile.tile-position-3-3 { - -webkit-transform: translate(242px, 242px); - -moz-transform: translate(242px, 242px); - -ms-transform: translate(242px, 242px); - transform: translate(242px, 242px); } + -webkit-transform: translate(135px, 135px); + -moz-transform: translate(135px, 135px); + -ms-transform: translate(135px, 135px); + transform: translate(135px, 135px); } .tile.tile-position-3-4 { - -webkit-transform: translate(242px, 363px); - -moz-transform: translate(242px, 363px); - -ms-transform: translate(242px, 363px); - transform: translate(242px, 363px); } + -webkit-transform: translate(135px, 202px); + -moz-transform: translate(135px, 202px); + -ms-transform: translate(135px, 202px); + transform: translate(135px, 202px); } .tile.tile-position-4-1 { - -webkit-transform: translate(363px, 0px); - -moz-transform: translate(363px, 0px); - -ms-transform: translate(363px, 0px); - transform: translate(363px, 0px); } + -webkit-transform: translate(202px, 0px); + -moz-transform: translate(202px, 0px); + -ms-transform: translate(202px, 0px); + transform: translate(202px, 0px); } .tile.tile-position-4-2 { - -webkit-transform: translate(363px, 121px); - -moz-transform: translate(363px, 121px); - -ms-transform: translate(363px, 121px); - transform: translate(363px, 121px); } + -webkit-transform: translate(202px, 67px); + -moz-transform: translate(202px, 67px); + -ms-transform: translate(202px, 67px); + transform: translate(202px, 67px); } .tile.tile-position-4-3 { - -webkit-transform: translate(363px, 242px); - -moz-transform: translate(363px, 242px); - -ms-transform: translate(363px, 242px); - transform: translate(363px, 242px); } + -webkit-transform: translate(202px, 135px); + -moz-transform: translate(202px, 135px); + -ms-transform: translate(202px, 135px); + transform: translate(202px, 135px); } .tile.tile-position-4-4 { - -webkit-transform: translate(363px, 363px); - -moz-transform: translate(363px, 363px); - -ms-transform: translate(363px, 363px); - transform: translate(363px, 363px); } + -webkit-transform: translate(202px, 202px); + -moz-transform: translate(202px, 202px); + -ms-transform: translate(202px, 202px); + transform: translate(202px, 202px); } .tile .tile-inner { font-size: 35px; } @@ -744,5 +759,3 @@ hr { margin-top: 90px !important; } .game-message .lower { margin-top: 30px !important; } } - -/*# sourceMappingURL=main.css.map */ diff --git a/style/main.scss b/style/main.scss index 4deca03e3b..850ab3f1ef 100644 --- a/style/main.scss +++ b/style/main.scss @@ -33,7 +33,7 @@ html, body { html { // Disable pull-to-refresh or other possible swipe side effects - overscroll-behavior: contain; + overscroll-behavior: none; } body { From 4ad0d37ed759e7971ea04126c6698b172ed62881 Mon Sep 17 00:00:00 2001 From: Rick Byers Date: Wed, 17 Oct 2018 02:48:02 +0000 Subject: [PATCH 3/3] Fix --- style/main.css | 4 +--- style/main.scss | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/style/main.css b/style/main.css index 4a9543c494..c8bb5ff8c1 100644 --- a/style/main.css +++ b/style/main.css @@ -5,9 +5,7 @@ html, body { background: #faf8ef; color: #776e65; font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif; - font-size: 18px; } - -html { + font-size: 18px; overscroll-behavior: none; } body { diff --git a/style/main.scss b/style/main.scss index 850ab3f1ef..dbdbd2ff52 100644 --- a/style/main.scss +++ b/style/main.scss @@ -29,9 +29,7 @@ html, body { color: $text-color; font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif; font-size: 18px; -} -html { // Disable pull-to-refresh or other possible swipe side effects overscroll-behavior: none; }