Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x #31

Open
wants to merge 6 commits into
base: gh-pages
Choose a base branch
from
Open

x #31

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
<meta property="og:image" content="http://gabrielecirulli.github.io/2048/meta/og_image.png"/>
</head>
<body>

<div class="container">
<div class="heading">
<h1 class="title">Make 2048</h1>
<h1 class="title">Montai 2048</h1>
<div class="scores-container">
<div class="score-container">0</div>
<div class="best-container">0</div>
Expand All @@ -35,8 +36,7 @@ <h1 class="title">Make 2048</h1>
<div class="above-game">
<p class="game-intro">
<a class="restart-button">New Game</a>
Use the arrow keys to slide tiles. Combine similar tiles to create new ones.</p>

Use the arrow keys to slide tiles. Combine similar tiles to create new ones. X</p>
</div>

<div class="pre-game">
Expand Down
22 changes: 11 additions & 11 deletions style/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -405,45 +405,45 @@ hr {
font-size: 16px;
color: #354b59;}
.tile.tile-2 .tile-inner {
background: url('../tile-sets/udacity/2.png');
background: url('../tile-sets/MR/2.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
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: url('../tile-sets/udacity/4.png');
background: url('../tile-sets/MR/4.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
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 {
background: url('../tile-sets/udacity/8.png');
background: url('../tile-sets/MR/8.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
font-weight: medium;
font-size: 11px;
}
.tile.tile-16 .tile-inner {
background: url('../tile-sets/udacity/16.png');
background: url('../tile-sets/MR/16.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
font-weight: medium;
font-size: 10px;
}
.tile.tile-32 .tile-inner {
background: url('../tile-sets/udacity/32.png');
background: url('../tile-sets/MR/32.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
font-size: 14px;
}
.tile.tile-64 .tile-inner {
background: url('../tile-sets/udacity/64.png');
background: url('../tile-sets/MR/2.png');
background-size: 100%;
color: rgba(0,0,0,0);
font-size: 14px;

}
.tile.tile-128 .tile-inner {
font-weight: medium;
background: url('../tile-sets/udacity/128.png');
background: url('../tile-sets/MR/128.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286);
Expand All @@ -452,7 +452,7 @@ hr {
.tile.tile-128 .tile-inner {
font-size: 12px; } }
.tile.tile-256 .tile-inner {
background: url('../tile-sets/udacity/256.png');
background: url('../tile-sets/MR/256.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048);
Expand All @@ -461,7 +461,7 @@ hr {
.tile.tile-256 .tile-inner {
font-size: 16px; } }
.tile.tile-512 .tile-inner {
background: url('../tile-sets/udacity/512.png');
background: url('../tile-sets/MR/512.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381);
Expand All @@ -470,7 +470,7 @@ hr {
.tile.tile-512 .tile-inner {
font-size: 13px; } }
.tile.tile-1024 .tile-inner {
background: url('../tile-sets/udacity/1024.png');
background: url('../tile-sets/MR/1024.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619), inset 0 0 0 1px rgba(255, 255, 255, 0.28571);
Expand All @@ -479,7 +479,7 @@ hr {
.tile.tile-1024 .tile-inner {
font-size: 10px; } }
.tile.tile-2048 .tile-inner {
background: url('../tile-sets/udacity/2048.png');
background: url('../tile-sets/MR/2048.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556), inset 0 0 0 1px rgba(255, 255, 255, 0.33333);
Expand Down
Binary file added tile-sets/MR/1024.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/128.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/16.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/2048.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/256.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/32.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/512.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/64.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/a.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/b.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/e.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/f.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/h.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/j.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/k.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/n.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/q.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/s.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/MR/v.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.