Revert "change udacity tiles to pictures"

This reverts commit 392ba3a. Conflicts: style/main.css
2048-class · Apr 8, 2014 · 6d658cc · 6d658cc
1 parent 2cbb589
commit 6d658cc
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/style/main.css b/style/main.css
@@ -407,6 +407,7 @@ hr {
     color: #354b59;}
   .tile.tile-2 .tile-inner {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     color: rgba(0,0,0,0);
     background: url('../tile-sets/udacity/2.png');
@@ -435,6 +436,17 @@ hr {
     color: #f9f6f2;
     background: #9cc2d2;
 >>>>>>> parent of 392ba3a... change udacity tiles to pictures
+=======
+    color: #d87531;
+    background: #f5f5f5;
+    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: #dfeaf1;
+    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: #9cc2d2;
+>>>>>>> parent of 392ba3a... change udacity tiles to pictures
 =======
     color: #d87531;
     background: #f5f5f5;
@@ -456,6 +468,7 @@ hr {
   }
   .tile.tile-32 .tile-inner {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     color: rgba(0,0,0,0);
     background: url('../tile-sets/udacity/32.png');
@@ -465,6 +478,10 @@ hr {
     color: #f9f6f2;
     background: #f67c5f;
 >>>>>>> parent of 392ba3a... change udacity tiles to pictures
+=======
+    color: #f9f6f2;
+    background: #f67c5f;
+>>>>>>> parent of 392ba3a... change udacity tiles to pictures
 =======
     color: #f9f6f2;
     background: #f67c5f;
@@ -487,6 +504,7 @@ hr {
         font-size: 12px; } }
   .tile.tile-256 .tile-inner {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     color: rgba(0,0,0,0);
     background: url('../tile-sets/udacity/256.png');
@@ -496,6 +514,10 @@ hr {
     color: #f9f6f2;
     background: #edcc61;
 >>>>>>> parent of 392ba3a... change udacity tiles to pictures
+=======
+    color: #f9f6f2;
+    background: #edcc61;
+>>>>>>> parent of 392ba3a... change udacity tiles to pictures
 =======
     color: #f9f6f2;
     background: #edcc61;
@@ -507,6 +529,7 @@ hr {
         font-size: 16px; } }
   .tile.tile-512 .tile-inner {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     color: rgba(0,0,0,0);
     background: url('../tile-sets/udacity/512.png');
@@ -517,6 +540,11 @@ hr {
     font-weight: medium;
     background: #edc850;
 >>>>>>> parent of 392ba3a... change udacity tiles to pictures
+=======
+    color: #354b59;
+    font-weight: medium;
+    background: #edc850;
+>>>>>>> parent of 392ba3a... change udacity tiles to pictures
 =======
     color: #354b59;
     font-weight: medium;