Merge pull request #66 from jasonlong/spooky

Fix broken colors on Halloween
jasonlong · Oct 31, 2016 · 7f7eeaf · 7f7eeaf
2 parents 889a0bb + 51dccb0
commit 7f7eeaf
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 12 deletions.
diff --git a/chrome/iso.js b/chrome/iso.js
diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Isometric Contributions",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Renders an isometric pixel view of GitHub contribution graphs.",
   "content_scripts": [ {
     "css": [ "iso.css" ],

diff --git a/firefox/isometric-contributions.xpi b/firefox/isometric-contributions.xpi
diff --git a/firefox/isometric-contributions/iso.js b/firefox/isometric-contributions/iso.js
diff --git a/firefox/isometric-contributions/manifest.json b/firefox/isometric-contributions/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Isometric Contributions",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Renders an isometric pixel view of GitHub contribution graphs.",
   "content_scripts": [ {
     "css": [ "iso.css" ],

diff --git a/safari/isometric-contributions.safariextension/Info.plist b/safari/isometric-contributions.safariextension/Info.plist
@@ -13,9 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.13</string>
+	<string>1.0.14</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.13</string>
+	<string>1.0.14</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Database Quota</key>

diff --git a/safari/isometric-contributions.safariextension/iso.js b/safari/isometric-contributions.safariextension/iso.js
diff --git a/src/iso.coffee b/src/iso.coffee
@@ -300,12 +300,12 @@ class Iso
         pixelView.renderObject cube, p3d
 
   getSquareColor: (fill) ->
-    color = switch fill
+    color = switch fill.toLowerCase()
       when 'rgb(238, 238, 238)', '#eeeeee' then COLORS[0]
-      when 'rgb(214, 230, 133)', '#d6e685' then COLORS[1]
-      when 'rgb(140, 198, 101)', '#8cc665' then COLORS[2]
-      when 'rgb(68, 163, 64)',   '#44a340' then COLORS[3]
-      when 'rgb(30, 104, 35)',   '#1e6823' then COLORS[4]
+      when 'rgb(214, 230, 133)', '#d6e685', 'rgb(255, 238, 74)', '#ffee4a' then COLORS[1]
+      when 'rgb(140, 198, 101)', '#8cc665', 'rgb(255, 197, 1)',  '#ffc501' then COLORS[2]
+      when 'rgb(68, 163, 64)',   '#44a340', 'rgb(254, 150, 0)',  '#fe9600' then COLORS[3]
+      when 'rgb(30, 104, 35)',   '#1e6823', 'rgb(3, 0, 28)',     '#03001c' then COLORS[4]
 
   formatDateString: (dateStr, options) ->
     date = null