From 43aaf123a0776eb4d5087b7ec406de8e60bcc970 Mon Sep 17 00:00:00 2001
From: Gabriele Cirulli <gabrycir@gmail.com>
Date: Wed, 5 Mar 2014 18:50:32 +0100
Subject: [PATCH] mix colors with optional predefined colors for each tile

---
 style/main.css  | 21 +++++++++++++--------
 style/main.scss | 46 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/style/main.css b/style/main.css
index 437c8ce..16496f9 100644
--- a/style/main.css
+++ b/style/main.css
@@ -144,38 +144,43 @@ h1 {
     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 {
-    background: #edddb7;
+    color: #f9f6f2;
+    background: #f2b179;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
   .tile.tile-16 {
-    background: #edd9a6;
+    color: #f9f6f2;
+    background: #f59563;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
   .tile.tile-32 {
-    background: #edd695;
+    color: #f9f6f2;
+    background: #f67c5f;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.07937), inset 0 0 0 1px rgba(255, 255, 255, 0.04762); }
   .tile.tile-64 {
-    background: #edd384;
+    color: #f9f6f2;
+    background: #f65e3b;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.15873), inset 0 0 0 1px rgba(255, 255, 255, 0.09524); }
   .tile.tile-128 {
+    color: #f9f6f2;
     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; }
   .tile.tile-256 {
+    color: #f9f6f2;
     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);
-    color: #ede9e5;
     font-size: 45px; }
   .tile.tile-512 {
+    color: #f9f6f2;
     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);
-    color: #f9f6f2;
     font-size: 45px; }
   .tile.tile-1024 {
+    color: #f9f6f2;
     background: #edc53f;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619), inset 0 0 0 1px rgba(255, 255, 255, 0.28571);
-    color: #f9f6f2;
     font-size: 35px; }
   .tile.tile-2048 {
+    color: #f9f6f2;
     background: #edc22e;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556), inset 0 0 0 1px rgba(255, 255, 255, 0.33333);
-    color: #f9f6f2;
     font-size: 35px; }
diff --git a/style/main.scss b/style/main.scss
index 213c964..cbd820e 100644
--- a/style/main.scss
+++ b/style/main.scss
@@ -8,7 +8,7 @@ $tile-size: ($field-width - $grid-spacing * ($grid-row-cells + 1)) / $grid-row-c
 $tile-border-radius: 3px;
 
 $text-color: #776E65;
-$gold-text-color: #f9f6f2;
+$bright-text-color: #f9f6f2;
 
 $tile-color: #eee4da;
 $tile-gold-color: #edc22e;
@@ -109,6 +109,7 @@ h1 {
   @include transition(200ms ease);
   @include transition-property(top, left);
 
+  // Build position classes
   @for $x from 1 through $grid-row-cells {
     @for $y from 1 through $grid-row-cells {
       &.tile-position-#{$x}-#{$y} {
@@ -123,25 +124,50 @@ h1 {
   $exponent: 1;
   $limit: 11;
 
+  // Colors for all 11 states, false = no special color
+  $special-colors: false false, // 2
+                   false false, // 4
+                   #f78e48 true, // 8
+                   #fc5e2e true, // 16
+                   #ff3333 true, // 32
+                   #ff0000 true, // 64
+                   false true, // 128
+                   false true, // 256
+                   false true, // 512
+                   false true, // 1024
+                   false true; // 2048
+
+  // Build tile colors
   @while $exponent <= $limit {
     $power: pow($base, $exponent);
 
-    $gold-percent: ($exponent - 1) / ($limit - 1) * 100;
+    &.tile-#{$power} {
+      // Calculate base background color
+      $gold-percent: ($exponent - 1) / ($limit - 1) * 100;
+      $mixed-background: mix($tile-gold-color, $tile-color, $gold-percent);
 
-    $gold-text-percent: min($exponent + 2, $limit) / ($limit) * 100;
+      $nth-color: nth($special-colors, $exponent);
 
-    $glow-opacity: max($exponent - 4, 0) / ($limit - 4);
+      $special-background: nth($nth-color, 1);
+      $bright-color: nth($nth-color, 2);
 
-    &.tile-#{$power} {
-      background: mix($tile-gold-color, $tile-color, $gold-percent);
+      @if $special-background {
+        $mixed-background: mix($special-background, $mixed-background, 55%);
+      }
+
+      @if $bright-color {
+        color: $bright-text-color;
+      }
+
+      // Set background
+      background: $mixed-background;
 
+      // Add glow
+      $glow-opacity: max($exponent - 4, 0) / ($limit - 4);
       box-shadow: 0 0 30px 10px rgba($tile-gold-glow-color, $glow-opacity / 1.8),
                   inset 0 0 0 1px rgba(white, $glow-opacity / 3);
 
-      @if $exponent >= 8 {
-        color: mix($gold-text-color, $text-color, $gold-text-percent);
-      }
-
+      // Adjust font size for bigger numbers
       @if $power >= 100 and $power < 1000 {
         font-size: 45px;
       } @else if $power >= 1000 {
-- 
GitLab