This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 569e4a7 chore: Revised logo (new color), w/CSS for vert alignment
(#10237)
569e4a7 is described below
commit 569e4a7c507fac4d6f38cd22e6770780a2519409
Author: Evan Rusackas <e...@preset.io>
AuthorDate: Mon Jul 6 17:30:18 2020 -0700
chore: Revised logo (new color), w/CSS for vert alignment (#10237)
* out with the old, in with the new
* vertically centering logo once and for all
* lint: black instead of IDE formating
* touch config.py
* Styles -> StyledHeader
* nixing vestigial SVG
* removing trademark
Co-authored-by: Maxime Beauchemin <maximebeauche...@gmail.com>
---
superset-frontend/images/superset-logo-horiz.png | Bin 0 -> 11310 bytes
superset-frontend/images/superset-l...@2x.png | Bin 4132 -> 0 bytes
.../spec/javascripts/components/Menu_spec.jsx | 2 +-
superset-frontend/src/components/Menu/Menu.jsx | 13 +++++++++++--
superset/config.py | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/superset-frontend/images/superset-logo-horiz.png
b/superset-frontend/images/superset-logo-horiz.png
new file mode 100644
index 0000000..65c96ef
Binary files /dev/null and b/superset-frontend/images/superset-logo-horiz.png
differ
diff --git a/superset-frontend/images/superset-l...@2x.png
b/superset-frontend/images/superset-l...@2x.png
deleted file mode 100644
index 839f617..0000000
Binary files a/superset-frontend/images/superset-l...@2x.png and /dev/null
differ
diff --git a/superset-frontend/spec/javascripts/components/Menu_spec.jsx
b/superset-frontend/spec/javascripts/components/Menu_spec.jsx
index 11386f4..b0d9a98 100644
--- a/superset-frontend/spec/javascripts/components/Menu_spec.jsx
+++ b/superset-frontend/spec/javascripts/components/Menu_spec.jsx
@@ -73,7 +73,7 @@ const defaultProps = {
],
brand: {
path: '/superset/profile/admin/',
- icon: '/static/assets/images/superset-l...@2x.png',
+ icon: '/static/assets/images/superset-logo-horiz.png',
alt: 'Superset',
width: '126',
},
diff --git a/superset-frontend/src/components/Menu/Menu.jsx
b/superset-frontend/src/components/Menu/Menu.jsx
index 54dc4da..18e7759 100644
--- a/superset-frontend/src/components/Menu/Menu.jsx
+++ b/superset-frontend/src/components/Menu/Menu.jsx
@@ -20,6 +20,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { t } from '@superset-ui/translation';
import { Nav, Navbar, NavItem } from 'react-bootstrap';
+import styled from '@superset-ui/style';
import MenuObject from './MenuObject';
import NewMenu from './NewMenu';
import UserMenu from './UserMenu';
@@ -51,11 +52,19 @@ const propTypes = {
}).isRequired,
};
+const StyledHeader = styled.header`
+ .navbar-brand {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ }
+`;
+
export default function Menu({
data: { menu, brand, navbar_right: navbarRight },
}) {
return (
- <header className="top" id="main-menu">
+ <StyledHeader className="top" id="main-menu">
<Navbar inverse fluid staticTop role="navigation">
<Navbar.Header>
<Navbar.Brand>
@@ -114,7 +123,7 @@ export default function Menu({
)}
</Nav>
</Navbar>
- </header>
+ </StyledHeader>
);
}
diff --git a/superset/config.py b/superset/config.py
index 3b26373..f6989b8 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -194,7 +194,7 @@ PROXY_FIX_CONFIG = {"x_for": 1, "x_proto": 1, "x_host": 1,
"x_port": 1, "x_prefi
APP_NAME = "Superset"
# Uncomment to setup an App icon
-APP_ICON = "/static/assets/images/superset-l...@2x.png"
+APP_ICON = "/static/assets/images/superset-logo-horiz.png"
APP_ICON_WIDTH = 126
# Uncomment to specify where clicking the logo would take the user
