Skip to content

Commit

Permalink
Updated favicon
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Moffat committed Sep 15, 2016
1 parent 6415235 commit e34eaf6
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var express = require('express');
var path = require('path');
var favicon = require('serve-favicon');
var logger = require('morgan');
var handlebars = require('express-handlebars');
var cookieParser = require('cookie-parser');
Expand Down Expand Up @@ -150,8 +149,6 @@ handlebars = handlebars.create({
}
});

// uncomment after placing your favicon in /public
app.use(favicon(path.join(__dirname, '/public/favicon.ico')));
app.enable('trust proxy');
app.set('port', process.env.PORT || 4444);
app.use(logger('dev'));
Expand Down Expand Up @@ -190,7 +187,7 @@ app.use(app_context + '/stylesheets', express.static(path.join(__dirname, 'publi
app.use(app_context + '/fonts', express.static(path.join(__dirname, 'public/fonts')));
app.use(app_context + '/javascripts', express.static(path.join(__dirname, 'public/javascripts')));
app.use(app_context + '/lunr', express.static(path.join(__dirname, 'node_modules/lunr')));
app.use(app_context + '/favicon.ico', express.static(path.join(__dirname, 'public/favicon.ico')));
app.use(app_context + '/favicon.png', express.static(path.join(__dirname, 'public/favicon.png')));

// serving static content
app.use(express.static(path.join(__dirname, 'public')));
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openkb",
"version": "1.0.14",
"version": "1.0.15",
"description": "openKB is an Open Source Nodejs Markdown based knowledge base/FAQ/Wiki app with powerful lunr search",
"private": false,
"scripts": {
Expand Down Expand Up @@ -35,7 +35,6 @@
"nedb": "^1.8.0",
"nedb-session-store": "^1.1.1",
"remove-markdown": "^0.1.0",
"serve-favicon": "~2.1.3",
"simplemde": "^1.11.2",
"sitemap": "^1.8.1",
"walk": "^2.3.9"
Expand Down
Binary file removed public/favicon.ico
Binary file not shown.
Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions views/layouts/layout.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<link rel="stylesheet" href="{{app_context}}/stylesheets/mermaid.css">
<link rel="stylesheet" href="{{app_context}}/stylesheets/bootstrap-tokenfield.css">
<link rel="stylesheet" href="{{app_context}}/stylesheets/jpushmenu.css">
<link rel='icon' href='/favicon.png' />
<script src="{{app_context}}/jquery/jquery.min.js"></script>
<script>{{{state}}}</script>
<script src="{{app_context}}/bootstrap/js/bootstrap.min.js"></script>
Expand Down

0 comments on commit e34eaf6

Please sign in to comment.