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.

Sign up for GitHub

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

Set up serve-favicon and return to present #2

Merged
merged 2 commits into from
Jan 26, 2015
Merged

Set up serve-favicon and return to present #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d058dce
Update & set up serve-favicon
LeoVerto Jan 25, 2015
6212c34
Update year in footer
LeoVerto Jan 25, 2015
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
4 changes: 2 additions & 2 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ var app = express();
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');

// webservice
app.set('webservice', 'http://localhost:5000');

// uncomment after placing your favicon in /public
//app.use(favicon(__dirname + '/public/favicon.ico'));
app.use(favicon(__dirname + '/public/images/favicon.ico'));
app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"jade": "~1.6.0",
"knockout": "^3.2.0",
"morgan": "~1.3.0",
"serve-favicon": "~2.1.3",
"serve-favicon": "~2.2.0",
"superagent": "^0.21.0",
"superagent-bluebird-promise": "^0.5.1"
},
Expand Down
2 changes: 1 addition & 1 deletion views/footer.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ footer.footer
| and
a(href='http://knockoutjs.com/', target='_blank') knockoutJS
.col-md-4.text-center
small Copyright 2014 BookBrainz Developers
small Copyright 2015 BookBrainz Developers
.col-md-4.text-right
a(href='#'): small Privacy & Terms
2 changes: 1 addition & 1 deletion views/navbar.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ nav.navbar.navbar-default.navbar-inverse.navbar-fixed-top(role='navigation')
span.icon-bar

a.navbar-brand(href="/")
img(alt='Brand', src='/images/favicon.ico', style='height:1em; vertical-align:bottom; margin-right:.2em; display:inline;')
img(alt='Brand', src='/favicon.ico', style='height:1em; vertical-align:bottom; margin-right:.2em; display:inline;')
b B
| ook
b B
Expand Down