diff --git a/style/main.css b/style/main.css index b7b3fe4692..1009312024 100644 --- a/style/main.css +++ b/style/main.css @@ -23,6 +23,7 @@ h1.title { 0% { top: 25px; opacity: 1; } + 100% { top: -50px; opacity: 0; } } @@ -30,6 +31,7 @@ h1.title { 0% { top: 25px; opacity: 1; } + 100% { top: -50px; opacity: 0; } } @@ -37,10 +39,13 @@ h1.title { 0% { top: 25px; opacity: 1; } + 100% { top: -50px; opacity: 0; } } .scores-container { + display:flex; + align-items:stretch; float: right; text-align: right; } @@ -50,7 +55,7 @@ h1.title { background: #bbada0; padding: 12px 20px; font-size: 25px; - height: 25px; + min-height: 25px; line-height: 47px; font-weight: bold; border-radius: 3px; @@ -85,7 +90,9 @@ h1.title { .score-container:after { content: "Score"; } - +.best-container{ +margin-left :5px; +} .best-container:after { content: "Best"; } @@ -117,23 +124,21 @@ 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; } } -#night { - float: left; - padding: 7px; - margin-top: 10px; } - .game-container { margin-top: 10px; position: relative; @@ -188,41 +193,43 @@ 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; @@ -257,8 +264,9 @@ hr { line-height: 107px; -webkit-transform: translateZ(0); -moz-transform: translateZ(0); - -ms-transform: translateZ(0); - transform: translateZ(0); } + transform: translateZ(0); + } + .tile.tile-position-1-1 { -webkit-transform: translate(0px, 0px); -moz-transform: translate(0px, 0px); @@ -359,23 +367,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) { @@ -383,7 +391,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) { @@ -391,7 +399,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) { @@ -415,7 +423,7 @@ 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 { @@ -428,6 +436,7 @@ hr { -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 100% { opacity: 1; -webkit-transform: scale(1); @@ -441,6 +450,7 @@ hr { -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 100% { opacity: 1; -webkit-transform: scale(1); @@ -454,6 +464,7 @@ hr { -moz-transform: scale(0); -ms-transform: scale(0); transform: scale(0); } + 100% { opacity: 1; -webkit-transform: scale(1); @@ -474,11 +485,13 @@ 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); @@ -490,11 +503,13 @@ 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); @@ -506,11 +521,13 @@ 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); @@ -528,30 +545,43 @@ hr { .above-game:after { content: ""; display: block; + clear: both; } .game-intro { + float: left; line-height: 42px; - margin-top: 5px; margin-bottom: 0; width: 285px; - font-size: 14px; } + font-size: 14px;} -.restart-button, .undo-button { +.restart-button { display: inline-block; background: #8f7a66; border-radius: 3px; - padding: 0 20px; + padding: 5px 20px; text-decoration: none; color: #f9f6f2; - height: 40px; - line-height: 42px; + min-height: 40px; display: block; text-align: center; float: right; margin-left: 5px; - margin-top: 10px; - font-size: 16px; } + font-size: 10px; } + +.undo-button { + display: inline-block; + background: #8f7a66; + border-radius: 3px; + padding: 5px 20px; + text-decoration: none; + color: #f9f6f2; + min-height: 40px; + display: block; + text-align: center; + float: right; + margin-left: 5px; + font-size: 10px; } .game-explanation { margin-top: 10px; } @@ -569,14 +599,14 @@ hr { margin-top: 15px; } .container { - width: 280px; + width: 100%; + max-width:500px; margin: 0 auto; } .score-container, .best-container { margin-top: 0; padding: 15px 10px; - min-width: 40px; - font-size: 16px; } + min-width: 40px; } .heading { margin-bottom: 5px; } @@ -591,10 +621,11 @@ hr { width: 42%; padding: 0; display: block; - box-sizing: border-box; } + box-sizing: border-box; + margin-top: 0px; } .game-container { - margin-top: 15px; + margin:15px auto 0 auto; position: relative; padding: 10px; cursor: default; @@ -654,34 +685,33 @@ 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.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.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; } .grid-container { position: absolute; @@ -713,11 +743,12 @@ hr { .tile, .tile .tile-inner { width: 58px; height: 58px; - line-height: 58px; + line-height:35px; -webkit-transform: translateZ(0); -moz-transform: translateZ(0); - -ms-transform: translateZ(0); - transform: translateZ(0); } + transform: translateZ(0); + } + .tile.tile-position-1-1 { -webkit-transform: translate(0px, 0px); -moz-transform: translate(0px, 0px); @@ -800,7 +831,7 @@ hr { transform: translate(202px, 202px); } .tile .tile-inner { - font-size: 35px; } + font-size: 1.6rem; } .game-message p { font-size: 30px !important; @@ -809,5 +840,3 @@ hr { margin-top: 90px !important; } .game-message .lower { margin-top: 30px !important; } } - -/*# sourceMappingURL=main.css.map */