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

Master #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions Pusheen
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

13 changes: 2 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<body>
<div class="container">
<div class="heading">
<h1 class="title">Make 2048</h1>
<h1 class="title">Pusheen Cat Invasion</h1>
<div class="scores-container">
<div class="score-container">0</div>
<div class="best-container">0</div>
Expand All @@ -40,15 +40,10 @@ <h1 class="title">Make 2048</h1>
</div>

<div class="pre-game">
<p class="learn">Learn to make your own version of 2048 in 30 minutes in Udacity's mini online class for beginners.</p><a class="learn" href="https://www.udacity.com/course/ud248">Take the Class!</a>
</div>


<div class="game-container">
<div class="game-message">
<p></p>
<div class="lower">
<a href="http://www.udacity.com/course/ud248/"class="learn learn-low">Take the Class!</a>
<a class="retry-button">Play Again</a>
<div class="score-sharing"></div>
</div>
Expand Down Expand Up @@ -85,14 +80,10 @@ <h1 class="title">Make 2048</h1>

</div>
</div>


<p class="game-explanation">
<strong class="important">Make your own version:</strong> If you'd like to make your own version of this game, check out Udacity's newest course for beginners <a href="https://www.udacity.com/course/ud248" target="_blank">Make your own 2048</a>. No programming experience is required and in less than half an hour you'll dig into the source code, make some changes, and have your own version of the game to share.
</p>
<hr>
<p class="game-explanation">
<strong class="important">How to play:</strong> Use your <strong>arrow keys</strong> to move the tiles. When two tiles with the same value touch, they <strong>merge into one!</strong>
<strong class="important">How to play:</strong> Use your <strong>arrow keys</strong> to move the tiles. When two tiles with the same picture touch, they <strong>merge into one!</strong>
</p>
<hr>
<p>
Expand Down
4 changes: 2 additions & 2 deletions style/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
html, body {
margin: 0;
padding: 0;
background: #9cc2d2;
color: #354b59;
background: url('../tile-sets/background.gif');
color: #1a102d;
font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif;
font-family: "Whitney SSm A","Whitney SSm B","Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 18px; }
Expand Down
Binary file added tile-sets/background.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tile-sets/presidents/1024.jpeg
Binary file not shown.
Binary file added tile-sets/presidents/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 modified tile-sets/presidents/128.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/16.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/2.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/2048.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/256.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/32.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/4.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/512.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/64.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tile-sets/presidents/8.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.