diff --git a/superset-frontend/spec/javascripts/components/Menu_spec.jsx b/superset-frontend/spec/javascripts/components/Menu_spec.jsx index 0ae18849580..5033675a648 100644 --- a/superset-frontend/spec/javascripts/components/Menu_spec.jsx +++ b/superset-frontend/spec/javascripts/components/Menu_spec.jsx @@ -18,7 +18,8 @@ */ import React from 'react'; import { shallow, mount } from 'enzyme'; -import { Nav, NavDropdown, MenuItem } from 'react-bootstrap'; +import { Nav, MenuItem } from 'react-bootstrap'; +import NavDropdown from 'src/components/NavDropdown'; import { supersetTheme, ThemeProvider } from '@superset-ui/style'; import Menu from 'src/components/Menu/Menu'; diff --git a/superset-frontend/src/components/Menu/Menu.tsx b/superset-frontend/src/components/Menu/Menu.tsx index 87f846f5e13..a41bc926aee 100644 --- a/superset-frontend/src/components/Menu/Menu.tsx +++ b/superset-frontend/src/components/Menu/Menu.tsx @@ -18,7 +18,8 @@ */ import React from 'react'; import { t } from '@superset-ui/translation'; -import { Nav, Navbar, NavDropdown, NavItem, MenuItem } from 'react-bootstrap'; +import { Nav, Navbar, NavItem, MenuItem } from 'react-bootstrap'; +import NavDropdown from 'src/components/NavDropdown'; import styled from '@superset-ui/style'; import MenuObject, { MenuObjectProps } from './MenuObject'; import NewMenu from './NewMenu'; @@ -56,6 +57,10 @@ export interface MenuProps { } const StyledHeader = styled.header` + &:nth-last-of-type(2) nav { + margin-bottom: 2px; + } + .caret { display: none; } diff --git a/superset-frontend/src/components/Menu/SubMenu.tsx b/superset-frontend/src/components/Menu/SubMenu.tsx index 79c3f46614b..f3a27e95d09 100644 --- a/superset-frontend/src/components/Menu/SubMenu.tsx +++ b/superset-frontend/src/components/Menu/SubMenu.tsx @@ -22,8 +22,6 @@ import { Nav, Navbar, MenuItem } from 'react-bootstrap'; import Button, { OnClickHandler } from 'src/components/Button'; const StyledHeader = styled.header` - position: relative; - top: -20px; .navbar-header .navbar-brand { font-weight: ${({ theme }) => theme.typography.weights.bold}; }