diff --git a/style/main.css b/style/main.css index d25c409dcd..81036f878f 100644 --- a/style/main.css +++ b/style/main.css @@ -23,7 +23,6 @@ h1.title { 0% { top: 25px; opacity: 1; } - 100% { top: -50px; opacity: 0; } } @@ -31,7 +30,6 @@ h1.title { 0% { top: 25px; opacity: 1; } - 100% { top: -50px; opacity: 0; } } @@ -39,7 +37,6 @@ h1.title { 0% { top: 25px; opacity: 1; } - 100% { top: -50px; opacity: 0; } } @@ -120,19 +117,16 @@ hr { @-webkit-keyframes fade-in { 0% { opacity: 0; } - 100% { opacity: 1; } } @-moz-keyframes fade-in { 0% { opacity: 0; } - 100% { opacity: 1; } } @keyframes fade-in { 0% { opacity: 0; } - 100% { opacity: 1; } } .game-container { @@ -189,43 +183,41 @@ hr { height: 40px; line-height: 42px; margin-left: 9px; } - .game-container .game-message a.keep-playing-button, .game-container .game-message a.confirm-button, .game-container .game-message a.cancel-button, .game-container .game-message a.undo-move-button { + .game-container .game-message a.keep-playing-button, .game-container .game-message a.confirm-button, .game-container .game-message a.cancel-button, .game-container .game-message a.undo-move-button { display: none; } .game-container .game-message.game-won { background: rgba(237, 194, 46, 0.5); color: #f9f6f2; } .game-container .game-message.game-won a.keep-playing-button { display: inline-block; } - .game-container .game-message.game-won, .game-container .game-message.game-over, .game-container .game-message.restart-game, .game-container .game-message.undo-move { + .game-container .game-message.game-won, .game-container .game-message.game-over, .game-container .game-message.restart-game, .game-container .game-message.undo-move { display: block; } - -.game-container .game-message.restart-game { - -webkit-animation: fade-in 400ms ease 100ms; - -moz-animation: fade-in 400ms ease 100ms; - animation: fade-in 400ms ease 100ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - animation-fill-mode: both; } -.game-container .game-message.restart-game .lower { - margin-top: 85px; } -.game-container .game-message.restart-game .lower a.confirm-button, .game-container .game-message.restart-game .lower a.cancel-button { - display: inline-block; } -.game-container .game-message.restart-game .lower a.retry-button { - display: none; } - -.game-container .game-message.undo-move { - -webkit-animation: fade-in 400ms ease 100ms; - -moz-animation: fade-in 400ms ease 100ms; - animation: fade-in 400ms ease 100ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - animation-fill-mode: both; } -.game-container .game-message.undo-move .lower { - margin-top: 85px; } -.game-container .game-message.undo-move .lower a.undo-move-button, .game-container .game-message.undo-move .lower a.cancel-button { - display: inline-block; } -.game-container .game-message.undo-move .lower a.retry-button { - display: none; } + .game-container .game-message.restart-game { + -webkit-animation: fade-in 400ms ease 100ms; + -moz-animation: fade-in 400ms ease 100ms; + animation: fade-in 400ms ease 100ms; + -webkit-animation-fill-mode: both; + -moz-animation-fill-mode: both; + animation-fill-mode: both; } + .game-container .game-message.restart-game .lower { + margin-top: 85px; } + .game-container .game-message.restart-game .lower a.confirm-button, .game-container .game-message.restart-game .lower a.cancel-button { + display: inline-block; } + .game-container .game-message.restart-game .lower a.retry-button { + display: none; } + .game-container .game-message.undo-move { + -webkit-animation: fade-in 400ms ease 100ms; + -moz-animation: fade-in 400ms ease 100ms; + animation: fade-in 400ms ease 100ms; + -webkit-animation-fill-mode: both; + -moz-animation-fill-mode: both; + animation-fill-mode: both; } + .game-container .game-message.undo-move .lower { + margin-top: 85px; } + .game-container .game-message.undo-move .lower a.undo-move-button, .game-container .game-message.undo-move .lower a.cancel-button { + display: inline-block; } + .game-container .game-message.undo-move .lower a.retry-button { + display: none; } .grid-container { position: absolute; @@ -260,9 +252,8 @@ hr { line-height: 107px; -webkit-transform: translateZ(0); -moz-transform: translateZ(0); - transform: translateZ(0); - } - + -ms-transform: translateZ(0); + transform: translateZ(0); } .tile.tile-position-1-1 { -webkit-transform: translate(0px, 0px); -moz-transform: translate(0px, 0px); @@ -363,23 +354,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) { @@ -387,7 +378,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) { @@ -395,7 +386,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) { @@ -419,7 +410,7 @@ 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 { @@ -432,7 +423,6 @@ hr { -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 100% { opacity: 1; -webkit-transform: scale(1); @@ -446,7 +436,6 @@ hr { -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 100% { opacity: 1; -webkit-transform: scale(1); @@ -460,7 +449,6 @@ hr { -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } - 100% { opacity: 1; -webkit-transform: scale(1); @@ -481,13 +469,11 @@ hr { -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); @@ -499,13 +485,11 @@ hr { -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); @@ -517,13 +501,11 @@ hr { -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); @@ -548,24 +530,9 @@ hr { line-height: 42px; margin-bottom: 0; width: 285px; - font-size: 14px;} + font-size: 14px; } -.restart-button { - display: inline-block; - background: #8f7a66; - border-radius: 3px; - padding: 0 20px; - text-decoration: none; - color: #f9f6f2; - height: 40px; - line-height: 42px; - display: block; - text-align: center; - float: right; - margin-left: 5px; - font-size: 16px; } - -.undo-button { +.restart-button, .undo-button { display: inline-block; background: #8f7a66; border-radius: 3px; @@ -681,33 +648,34 @@ hr { color: #f9f6f2; } .game-container .game-message.game-won a.keep-playing-button { display: inline-block; } - .game-container .game-message.game-won, .game-container .game-message.game-over, .game-container .game-message.restart-game, .game-container .game-message.undo-move { + .game-container .game-message.game-won, .game-container .game-message.game-over, .game-container .game-message.restart-game, .game-container .game-message.undo-move { display: block; } -.game-container .game-message.restart-game { - -webkit-animation: fade-in 400ms ease 100ms; - -moz-animation: fade-in 400ms ease 100ms; - animation: fade-in 400ms ease 100ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - animation-fill-mode: both; } -.game-container .game-message.undo-move { - -webkit-animation: fade-in 400ms ease 100ms; - -moz-animation: fade-in 400ms ease 100ms; - animation: fade-in 400ms ease 100ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - animation-fill-mode: both; } -.game-container .game-message.restart-game .lower { - margin-top: 85px; } - .game-container .game-message.restart-game .lower a.confirm-button, .game-container .game-message.restart-game .lower a.cancel-button { - display: inline-block; } -.game-container .game-message.restart-game .lower a.retry-button { - display: none; } - -.game-container .game-message.undo-move .lower { - margin-top: 85px; } - .game-container .game-message.undo-move .lower a.undo-move-button, .game-container .game-message.undo-move .lower a.cancel-button { - display: inline-block; } + .game-container .game-message.restart-game { + -webkit-animation: fade-in 400ms ease 100ms; + -moz-animation: fade-in 400ms ease 100ms; + animation: fade-in 400ms ease 100ms; + -webkit-animation-fill-mode: both; + -moz-animation-fill-mode: both; + animation-fill-mode: both; } + .game-container .game-message.restart-game .lower { + margin-top: 85px; } + .game-container .game-message.restart-game .lower a.confirm-button, .game-container .game-message.restart-game .lower a.cancel-button { + display: inline-block; } + .game-container .game-message.restart-game .lower a.retry-button { + display: none; } + .game-container .game-message.undo-move { + -webkit-animation: fade-in 400ms ease 100ms; + -moz-animation: fade-in 400ms ease 100ms; + animation: fade-in 400ms ease 100ms; + -webkit-animation-fill-mode: both; + -moz-animation-fill-mode: both; + animation-fill-mode: both; } + .game-container .game-message.undo-move .lower { + margin-top: 85px; } + .game-container .game-message.undo-move .lower a.undo-move-button, .game-container .game-message.undo-move .lower a.cancel-button { + display: inline-block; } + .game-container .game-message.undo-move .lower a.retry-button { + display: none; } .grid-container { position: absolute; @@ -742,9 +710,8 @@ hr { line-height: 58px; -webkit-transform: translateZ(0); -moz-transform: translateZ(0); - transform: translateZ(0); - } - + -ms-transform: translateZ(0); + transform: translateZ(0); } .tile.tile-position-1-1 { -webkit-transform: translate(0px, 0px); -moz-transform: translate(0px, 0px); @@ -836,3 +803,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 339bc27a20..21614d0190 100644 --- a/style/main.scss +++ b/style/main.scss @@ -9,7 +9,7 @@ $tile-border-radius: 3px; $mobile-threshold: $field-width + 20px; -$text-color: #776E65; +$text-color: #776e65; $bright-text-color: #f9f6f2; $tile-color: #eee4da; @@ -504,12 +504,11 @@ hr { @include smaller($mobile-threshold) { // Redefine variables for smaller screens - $field-width: 280px; - $grid-spacing: 10px; - $grid-row-cells: 4; - $tile-size: ($field-width - $grid-spacing * ($grid-row-cells + 1)) / $grid-row-cells; - $tile-border-radius: 3px; - $game-container-margin-top: 15px; + $field-width: 280px !global; + $grid-spacing: 10px !global; + $tile-size: ($field-width - $grid-spacing * ($grid-row-cells + 1)) / $grid-row-cells !global; + $tile-border-radius: 3px !global; + $game-container-margin-top: 15px !global; html, body { font-size: 15px;