Merge branch 'master' into jest-tests

Emmanouil Konstantinidis · Emmanouil Konstantinidis · commit 3590f7e89726 · 2015-05-31T01:47:58.000+01:00
diff --git a/README.md b/README.md
@@ -28,20 +28,20 @@ If you encounter any issues with `npm install`, then run `ulimit -n 512`.
     npm install
 
 
-    ### Development
-    To watch for changes in the `src` directory:
+### Development
+To watch for changes in the `src` directory:
 
-        npm run watch
+    npm run watch
 
-    To run the actual **electron app**:
+To run the actual **electron app**:
 
-        npm start
+    npm start
 
 
 ### Distribution
 To prepare the app for distribution run:
 
-      npm run dist
+    npm run dist
 
 Currently supports only OS X.
 
diff --git a/images/tray-idleTemplate.png b/images/tray-idleTemplate.png
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Github Notifier</title>
+    <title>Gitify</title>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/main.js b/main.js
@@ -8,7 +8,7 @@ var Menu = require('menu');
 var Tray = require('tray');
 var BrowserWindow = require('browser-window');
 
-var iconIdle = path.join(__dirname, 'images', 'tray-idle.png');
+var iconIdle = path.join(__dirname, 'images', 'tray-idleTemplate.png');
 var iconActive = path.join(__dirname, 'images', 'tray-active.png');
 
 app.on('ready', function(){
@@ -95,5 +95,5 @@ app.on('ready', function(){
   });
 
   app.dock.hide();
-  appIcon.setToolTip('Github Notifications on your menu bar.');
+  appIcon.setToolTip('GitHub Notifications on your menu bar.');
 });
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gitify",
   "version": "0.0.1",
-  "description": "Github Notifications on your menu bar.",
+  "description": "GitHub Notifications on your menu bar.",
   "main": "main.js",
   "scripts": {
     "build-js": "mkdir -p build/js && browserify -t reactify src/js/app.js -o build/js/app.js",
diff --git a/src/js/components/login.js b/src/js/components/login.js
@@ -91,7 +91,7 @@ var Login = React.createClass({
             <img className='img-responsive logo' src='images/github-logo.png' />
             <div className='desc'>GitHub notifications in your menu bar.</div>
             <button className='btn btn-default btn-lg btn-block' onClick={this.authGithub}>
-              <i className="fa fa-github" />Login to Gihub
+              <i className="fa fa-github" />Log in to GitHub
             </button>
           </div>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gitify",`
`3`	`3`	`"version": "0.0.1",`
`4`		`- "description": "Github Notifications on your menu bar.",`
	`4`	`+ "description": "GitHub Notifications on your menu bar.",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"build-js": "mkdir -p build/js && browserify -t reactify src/js/app.js -o build/js/app.js",`