Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

[bug] Favicon invalid path [fixes #979] #987

Merged
merged 1 commit into from
Oct 18, 2015
Merged
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
12 changes: 6 additions & 6 deletions modules/core/server/views/layout.server.view.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
Expand All @@ -19,17 +19,17 @@
<meta property="og:title" content="{{title}}">
<meta property="og:description" content="{{description}}">
<meta property="og:url" content="{{url}}">
<meta property="og:image" content="{{url}}{{logo}}">
<meta property="og:image" content="{{logo}}">
<meta property="og:type" content="website">

<!-- Twitter META -->
<meta name="twitter:title" content="{{title}}">
<meta name="twitter:description" content="{{description}}">
<meta name="twitter:url" content="{{url}}">
<meta name="twitter:image" content="{{url}}modules/core/img/brand/logo.png">
<meta name="twitter:image" content="{{logo}}">

<!-- Fav Icon -->
<link href="{{url}}{{favicon}}" rel="shortcut icon" type="image/x-icon">
<link href="{{favicon}}" rel="shortcut icon" type="image/x-icon">

<!-- Application CSS Files -->
{% for cssFile in cssFiles %}<link rel="stylesheet" href="{{cssFile}}">{% endfor %}
Expand All @@ -47,12 +47,12 @@
<script type="text/javascript">
var user = {{ user | json | safe }};
</script>

<!--Load The Socket.io File-->
<script type="text/javascript" src="/socket.io/socket.io.js"></script>

<!--Application JavaScript Files-->
{% for jsFile in jsFiles %}<script type="text/javascript" src="{{jsFile}}"></script>{% endfor %}
{% for jsFile in jsFiles %}<script type="text/javascript" src="{{jsFile}}"></script>{% endfor %}

{% if livereload %}
<!--Livereload script rendered -->
Expand Down