0
0
@@ -34,13 +34,13 @@
Make 2048
- New Game
- Use the arrow keys to slide tiles. Combine similar tiles to create new ones.
+
New Try
+
-
Learn to make your own version of 2048 in 30 minutes in Udacity's mini online class for beginners.
Take the Class!
+
Die Mäuse sind los ;)
diff --git a/karinkos-2048/.gitattributes b/karinkos-2048/.gitattributes
new file mode 100644
index 0000000000..bdb0cabc87
--- /dev/null
+++ b/karinkos-2048/.gitattributes
@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
diff --git a/karinkos-2048/.gitignore b/karinkos-2048/.gitignore
new file mode 100644
index 0000000000..cd2946ad76
--- /dev/null
+++ b/karinkos-2048/.gitignore
@@ -0,0 +1,47 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
diff --git a/style/main.css b/style/main.css
index d019f67a80..423590b120 100644
--- a/style/main.css
+++ b/style/main.css
@@ -3,11 +3,11 @@
html, body {
margin: 0;
padding: 0;
- background: #9cc2d2;
- color: #354b59;
+ background: #c66300;
+ color: #ffe9d2;
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; }
+ font-size: 14px; }
body {
margin: 80px 0; }
@@ -60,7 +60,7 @@ input {
clear: both; }
h1.title {
- font-size: 55px;
+ font-size: 40px;
font-weight: medium;
margin: 0;
display: block;
@@ -97,14 +97,14 @@ h1.title {
.score-container, .best-container {
position: relative;
display: inline-block;
- background: #0c92bf;
+ background: #ffe9d2;
padding: 15px 25px;
font-size: 25px;
height: 25px;
line-height: 47px;
font-weight: bold;
border-radius: 3px;
- color: white;
+ color: #391d00;
margin-top: 8px;
text-align: center; }
.score-container:after, .best-container:after {
@@ -116,7 +116,7 @@ h1.title {
font-size: 13px;
line-height: 13px;
text-align: center;
- color: #eee4da; }
+ color: #391d00; }
.score-container .score-addition, .best-container .score-addition {
position: absolute;
right: 30px;
@@ -147,6 +147,7 @@ p {
a {
font-weight: medium;
text-decoration: underline;
+ color: #391d00;
cursor: pointer; }
strong.important {
@@ -210,7 +211,7 @@ hr {
-ms-user-select: none;
-ms-touch-action: none;
touch-action: none;
- background: #1e6477;
+ background: #391d00;
border-radius: 6px;
width: 500px;
height: 500px;
@@ -225,7 +226,7 @@ hr {
right: 0;
bottom: 0;
left: 0;
- background: rgba(150, 150, 150, 0.83);
+ background: rgba(255, 233, 210, 0.83);
z-index: 100;
padding-top: 40px;
text-align: center;
@@ -254,7 +255,7 @@ hr {
margin-right: 5px; }
.game-message a {
display: inline-block;
- background: #8f7a66;
+ background: #ffe9d2;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
@@ -405,37 +406,37 @@ hr {
font-size: 16px;
color: #354b59;}
.tile.tile-2 .tile-inner {
- background: url('../tile-sets/udacity/2.png');
+ background: url('../tile-sets/karinko/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/karinko/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/karinko/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/karinko/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/karinko/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/karinko/64.jpg');
background-size: 100%;
color: rgba(0,0,0,0);
font-size: 14px;
@@ -443,7 +444,7 @@ hr {
}
.tile.tile-128 .tile-inner {
font-weight: medium;
- background: url('../tile-sets/udacity/128.png');
+ background: url('../tile-sets/karinko/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);
@@ -452,7 +453,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/karinko/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);
@@ -461,7 +462,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/karinko/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);
@@ -470,7 +471,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/karinko/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);
@@ -479,7 +480,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/karinko/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);
@@ -605,7 +606,7 @@ hr {
.game-intro {
margin-top: 5px;
- float: left;
+ float: right;
line-height: 30px;
margin-bottom: 0; }
@@ -982,7 +983,7 @@ a.learn:hover, a.keep-playing-button:hover, a.learn-low:hover {
}
.restart-button, a.retry-button {
display: inline-block;
- background: #1e6477;
+ background: #391d00;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
diff --git a/tile-sets/karinko/1024.jpg b/tile-sets/karinko/1024.jpg
new file mode 100644
index 0000000000..d6d84c8272
Binary files /dev/null and b/tile-sets/karinko/1024.jpg differ
diff --git a/tile-sets/karinko/128.jpg b/tile-sets/karinko/128.jpg
new file mode 100644
index 0000000000..d3863174b3
Binary files /dev/null and b/tile-sets/karinko/128.jpg differ
diff --git a/tile-sets/karinko/16.jpg b/tile-sets/karinko/16.jpg
new file mode 100644
index 0000000000..4176fc28e3
Binary files /dev/null and b/tile-sets/karinko/16.jpg differ
diff --git a/tile-sets/karinko/2.jpg b/tile-sets/karinko/2.jpg
new file mode 100644
index 0000000000..6b51f988c2
Binary files /dev/null and b/tile-sets/karinko/2.jpg differ
diff --git a/tile-sets/karinko/2048.jpg b/tile-sets/karinko/2048.jpg
new file mode 100644
index 0000000000..21a9643271
Binary files /dev/null and b/tile-sets/karinko/2048.jpg differ
diff --git a/tile-sets/karinko/256.jpg b/tile-sets/karinko/256.jpg
new file mode 100644
index 0000000000..3bfd86a704
Binary files /dev/null and b/tile-sets/karinko/256.jpg differ
diff --git a/tile-sets/karinko/32.jpg b/tile-sets/karinko/32.jpg
new file mode 100644
index 0000000000..2163fe0e38
Binary files /dev/null and b/tile-sets/karinko/32.jpg differ
diff --git a/tile-sets/karinko/4.jpg b/tile-sets/karinko/4.jpg
new file mode 100644
index 0000000000..1ed1d00310
Binary files /dev/null and b/tile-sets/karinko/4.jpg differ
diff --git a/tile-sets/karinko/512.jpg b/tile-sets/karinko/512.jpg
new file mode 100644
index 0000000000..ba65b170ea
Binary files /dev/null and b/tile-sets/karinko/512.jpg differ
diff --git a/tile-sets/karinko/64.jpg b/tile-sets/karinko/64.jpg
new file mode 100644
index 0000000000..615ee50a52
Binary files /dev/null and b/tile-sets/karinko/64.jpg differ
diff --git a/tile-sets/karinko/8.jpg b/tile-sets/karinko/8.jpg
new file mode 100644
index 0000000000..25aa88c846
Binary files /dev/null and b/tile-sets/karinko/8.jpg differ