Skip to content

Commit

Permalink
Merge pull request #75 from jasonlong/update-colors
Browse files Browse the repository at this point in the history
Update colors to match GitHub update
  • Loading branch information
jasonlong authored Mar 2, 2017
2 parents 665819d + 53c073d commit 955d7a0
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 77 deletions.
4 changes: 2 additions & 2 deletions chrome/iso.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
}

.ic-toggle-option.active {
background-color: #4183c4;
border-color: #4183c4;
background-color: #035dd2;
border-color: #035dd2;
}

.ic-toggle-option.active.tooltipped:focus::before,
Expand Down
30 changes: 11 additions & 19 deletions chrome/iso.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Isometric Contributions",
"version": "1.0.16",
"version": "1.0.17",
"description": "Renders an isometric pixel view of GitHub contribution graphs.",
"content_scripts": [ {
"css": [ "iso.css" ],
Expand Down
Binary file modified firefox/isometric-contributions.xpi
Binary file not shown.
4 changes: 2 additions & 2 deletions firefox/isometric-contributions/iso.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
}

.ic-toggle-option.active {
background-color: #4183c4;
border-color: #4183c4;
background-color: #035dd2;
border-color: #035dd2;
}

.ic-toggle-option.active.tooltipped:focus::before,
Expand Down
30 changes: 11 additions & 19 deletions firefox/isometric-contributions/iso.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion firefox/isometric-contributions/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Isometric Contributions",
"version": "1.0.16",
"version": "1.0.17",
"description": "Renders an isometric pixel view of GitHub contribution graphs.",
"content_scripts": [ {
"css": [ "iso.css" ],
Expand Down
4 changes: 2 additions & 2 deletions safari/isometric-contributions.safariextension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleShortVersionString</key>
<string>1.0.16</string>
<string>1.0.17</string>
<key>CFBundleVersion</key>
<string>1.0.16</string>
<string>1.0.17</string>
<key>Chrome</key>
<dict>
<key>Database Quota</key>
Expand Down
4 changes: 2 additions & 2 deletions safari/isometric-contributions.safariextension/iso.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
}

.ic-toggle-option.active {
background-color: #4183c4 !important;
border-color: #4183c4;
background-color: #035dd2 !important;
border-color: #035dd2;
}

.ic-toggle-option.active.tooltipped:focus::before,
Expand Down
30 changes: 11 additions & 19 deletions safari/isometric-contributions.safariextension/iso.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/iso.coffee
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class Iso
COLORS = [
new obelisk.CubeColor().getByHorizontalColor(0xeeeeee),
new obelisk.CubeColor().getByHorizontalColor(0xd6e685),
new obelisk.CubeColor().getByHorizontalColor(0x8cc665),
new obelisk.CubeColor().getByHorizontalColor(0x44a340),
new obelisk.CubeColor().getByHorizontalColor(0x1e6823)
new obelisk.CubeColor().getByHorizontalColor(0xebedf0),
new obelisk.CubeColor().getByHorizontalColor(0xc6e48b),
new obelisk.CubeColor().getByHorizontalColor(0x7bc96f),
new obelisk.CubeColor().getByHorizontalColor(0x239a3b),
new obelisk.CubeColor().getByHorizontalColor(0x196127)
]

yearTotal = 0
Expand Down Expand Up @@ -301,11 +301,11 @@ class Iso

getSquareColor: (fill) ->
color = switch fill.toLowerCase()
when 'rgb(238, 238, 238)', '#eeeeee' then COLORS[0]
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]
when 'rgb(235, 237, 240)', '#ebedf0' then COLORS[0]
when 'rgb(198, 228, 139)', '#c6e48b' then COLORS[1]
when 'rgb(123, 201, 111)', '#7bc96f' then COLORS[2]
when 'rgb(35, 154, 59)', '#239a3b' then COLORS[3]
when 'rgb(25, 97, 39)', '#196127' then COLORS[4]

formatDateString: (dateStr, options) ->
date = null
Expand Down

0 comments on commit 955d7a0

Please sign in to comment.