Skip to content

Commit

Permalink
fix favicon
Browse files Browse the repository at this point in the history
  • Loading branch information
Kidel committed Jun 12, 2015
1 parent ac7e728 commit caa2031
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions WebContent/WEB-INF/meta.xhtml
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<c:set var="root" value="#{request.contextPath}" />
<c:set var="root" value="#{request.contextPath}" />

<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="SIW Project 2015" />
<meta name="author"
content="Gaetano Bonofiglio, Veronica Iovinella, Andrea Salvoni" />

<link rel="icon" href="#{root}/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="#{root}/favicon.ico"
type="image/x-icon" />
<link rel="icon" href="#{root}/favicon.png" type="image/png" />
<link rel="apple-touch-icon" href="#{root}/faviconphone.png" />

<link href="#{root}/css/jquery-ui.structure.min.css" rel="stylesheet" />
<link href="#{root}/css/jquery-ui.min.css" rel="stylesheet" />
<link href="#{root}/css/bootstrap.min.css" rel="stylesheet" />
<link href="#{root}/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />
<link href="#{root}/css/bootstrap-datetimepicker.min.css"
rel="stylesheet" />
<link href="#{root}/css/smartpaginator.css" rel="stylesheet" />
<link href="#{root}/css/shop.css" rel="stylesheet" />

<script src="#{root}/js/custom.js"></script>
</ui:composition>
Binary file modified WebContent/favicon.ico
Binary file not shown.
Binary file added WebContent/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added WebContent/faviconphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit caa2031

Please sign in to comment.