Skip to content

Commit

Permalink
chore: Revised logo (new color), w/CSS for vert alignment (#10237)
Browse files Browse the repository at this point in the history
* 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 <maximebeauchemin@gmail.com>
  • Loading branch information
rusackas and mistercrunch authored Jul 7, 2020
1 parent b9e0678 commit 569e4a7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed superset-frontend/images/superset-logo@2x.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const defaultProps = {
],
brand: {
path: '/superset/profile/admin/',
icon: '/static/assets/images/superset-logo@2x.png',
icon: '/static/assets/images/superset-logo-horiz.png',
alt: 'Superset',
width: '126',
},
Expand Down
13 changes: 11 additions & 2 deletions superset-frontend/src/components/Menu/Menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -114,7 +123,7 @@ export default function Menu({
)}
</Nav>
</Navbar>
</header>
</StyledHeader>
);
}

Expand Down
2 changes: 1 addition & 1 deletion superset/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def _try_json_readsha( # pylint: disable=unused-argument
APP_NAME = "Superset"

# Uncomment to setup an App icon
APP_ICON = "/static/assets/images/superset-logo@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
Expand Down

0 comments on commit 569e4a7

Please sign in to comment.