adds working icons, plus a releases badge

mattxwang · Apr 15, 2017 · eaa5b15 · eaa5b15
1 parent 7c3c352
commit eaa5b15
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Fair Chair
 
 [![Build Status](https://travis-ci.org/malsf21/fair-chair.svg?branch=master)](https://travis-ci.org/malsf21/fair-chair)
+[![GitHub Release](https://img.shields.io/github/release/malsf21/fair-chair.svg)](https://github.com/malsf21/fair-chair/releases)
 
 > Making chairing Model UN conferences easy and fair
 
@@ -85,8 +86,6 @@ $ npm run build-osx
 
 ```
 
-*Note: Application icons don't work right now. I'm working on it!*
-
 ## Credits
 
 Fair Chair was made by Matthew Wang (@malsf21) for the [Ontario Model United Nations Conference](https://omun.ca).
diff --git a/main.js b/main.js
@@ -5,7 +5,7 @@ const url = require('url')
 let win
 
 function createWindow () {
-  win = new BrowserWindow({width: 1280, height: 900})
+  win = new BrowserWindow({width: 1280, height: 900, icon:"img/omun.png"})
   win.loadURL(url.format({
     pathname: path.join(__dirname, 'index.html'),
     protocol: 'file:',

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "main"    : "main.js",
   "scripts": {
     "start": "electron .",
-    "build-osx": "electron-packager ./ FairChair --platform=darwin --arch=x64 —icon=omun.icns",
+    "build-osx": "electron-packager ./ FairChair --platform=darwin --arch=x64 --icon=omun.icns",
     "build-linux": "electron-packager ./ FairChair --platform=linux --arch=x64"
   },
   "license": "GPL-3.0",