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.

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

Update to hi-res logo & favicon as well as optimize all image files #5748

Merged
merged 1 commit into from Mar 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified graylog2-web-interface/public/images/auth/loginbg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graylog2-web-interface/public/images/favicon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graylog2-web-interface/public/images/not-found-bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graylog2-web-interface/public/images/topbg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed graylog2-web-interface/public/images/toplogo.png
Binary file not shown.
1 change: 1 addition & 0 deletions graylog2-web-interface/public/images/toplogo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion graylog2-web-interface/public/stylesheets/graylog2.less
Expand Up @@ -111,7 +111,7 @@ legend small {
}

.navbar-brand {
width: 155px;
padding: 12px 15px 0 15px;
}

#universalsearch {
Expand Down
@@ -1,12 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';

const logoUrl = require('images/toplogo.png');
// const logoUrl = require('images/toplogo.png');
const logoUrl = require('images/toplogo.svg');

// Don't pass active prop, since `a` tag doesn't support it.
// eslint-disable-next-line no-unused-vars
function BrandComponent({ active, ...props }) {
return <a {...props}><img src={logoUrl} alt="Graylog logo" /></a>;
// return <a {...props}><img src={logoUrl} alt="Graylog logo" /></a>;
return <a {...props}><img src={logoUrl} alt="Graylog logo" width="90" /></a>;
}

BrandComponent.propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/templates/index.html.template
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title><%=htmlWebpackPlugin.options.title || 'Webpack App'%></title>
<% if (htmlWebpackPlugin.files.favicon) { %>
<link rel="shortcut icon" href="<%=htmlWebpackPlugin.files.favicon%>">
<link rel="shortcut icon" type="image/png" href="<%=htmlWebpackPlugin.files.favicon%>">
<% } %>
<% for (var css in htmlWebpackPlugin.files.css) { %>
<link href="<%=htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
Expand Down