Delete remaining conduit logo; add linkerd favicon (#1343)

- Remove a conduit image from our img folder
- Add a linkerd favicon, should no longer get the favicon not found console error
- Configure webpack to not hash image names
This commit is contained in:
Risha Mars 2018-07-18 17:27:57 -07:00 committed by GitHub
parent 829371bc06
commit 9821b97326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 1 deletions

BIN
web/app/img/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -10,6 +10,7 @@ import ServiceMesh from './components/ServiceMesh.jsx';
import Sidebar from './components/Sidebar.jsx';
import { BrowserRouter, Redirect, Route, Switch } from 'react-router-dom';
import './../css/styles.css';
import './../img/favicon.png'; // needs to be referenced somewhere so webpack bundles it
let appMain = document.getElementById('main');
let appData = !appMain ? {} : appMain.dataset;

View File

@ -47,7 +47,9 @@ module.exports = {
use: [
{
loader: 'file-loader',
options: {}
options: {
name: 'img/[name].[ext]'
}
}
]
}

View File

@ -7,6 +7,7 @@
<title>Linkerd</title>
<meta name="description" content="Linkerd">
<meta name="keywords" content="Linkerd">
<link rel="icon" type="image/png" href="{{.Contents.PathPrefix}}dist/img/favicon.png">
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700,900" rel="stylesheet">
{{ template "script-tags" . }}
</head>