Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Simplenote favicon. Because why not. #25

Merged
merged 1 commit into from
Oct 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"babelify": "^6.3.0",
"browserify-middleware": "^7.0.0",
"express": "^4.13.3",
"serve-favicon": "^2.3.0",
"node-sass-middleware": "^0.9.6",
"promise": "^7.0.4"
}
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
5 changes: 5 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var express = require('express'),
favicon = require( 'serve-favicon' ),
path = require( 'path' ),
browserify = require('browserify-middleware'),
sass = require('node-sass-middleware'),
app = express(),
Expand Down Expand Up @@ -36,6 +38,9 @@ app.use(sass({
response:true
}));

// favicon
app.use( favicon( path.join( __dirname, '.', 'public_html', 'favicon.ico' ) ) );

// serve app html
app.get('/', function(req, res) {
var settings = config();
Expand Down
1 change: 1 addition & 0 deletions views/app.jade
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ html
head
title Simplenote
link(rel="stylesheet" type="text/css" href="app.css")
link(rel="icon" href="/favicon.ico")
link(rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:100,200,300,400,400italic")
script(type="text/javascript")!="var config=" + JSON.stringify(config) + ";"
body
Expand Down