diff --git a/src/layout/navbar/avatarDropdown/avatarDropdown.container.js b/src/layout/avatarDropdown/avatarDropdown.container.js similarity index 100% rename from src/layout/navbar/avatarDropdown/avatarDropdown.container.js rename to src/layout/avatarDropdown/avatarDropdown.container.js diff --git a/src/layout/navbar/avatarDropdown/avatarDropdown.css b/src/layout/avatarDropdown/avatarDropdown.css similarity index 51% rename from src/layout/navbar/avatarDropdown/avatarDropdown.css rename to src/layout/avatarDropdown/avatarDropdown.css index 42c10fcc2..cbe9da4fc 100644 --- a/src/layout/navbar/avatarDropdown/avatarDropdown.css +++ b/src/layout/avatarDropdown/avatarDropdown.css @@ -1,18 +1,22 @@ -.avatar-dropdown .cc-avatar-image > img { +.avatar-dropdown-button .cc-avatar-image > img { border: 2px solid var(--primary-color-font); font-size: 1.5em; } -.avatar-dropdown .cc-avatar-image > img:hover { +.avatar-dropdown-button .cc-avatar-image > img:hover { border: 2px solid var(--secondary-color); cursor: pointer; } -.avatar-dropdown .cc-avatar-initials { +.avatar-dropdown-button .cc-avatar-initials { border: 2px solid var(--secondary-color); } -.avatar-dropdown .cc-avatar-initials:hover { +.avatar-dropdown-button .cc-avatar-initials:hover { border: 2px solid var(--secondary-color-font); cursor: pointer; } + +.avatar-dropdown { + z-index: 110; +} diff --git a/src/layout/navbar/avatarDropdown/avatarDropdown.jsx b/src/layout/avatarDropdown/avatarDropdown.jsx similarity index 87% rename from src/layout/navbar/avatarDropdown/avatarDropdown.jsx rename to src/layout/avatarDropdown/avatarDropdown.jsx index c4c6d92e9..decf00a8e 100644 --- a/src/layout/navbar/avatarDropdown/avatarDropdown.jsx +++ b/src/layout/avatarDropdown/avatarDropdown.jsx @@ -11,11 +11,9 @@ import './avatarDropdown.css' const AvatarDropdown = ({ displayName, photoURL, contributorsRoute, signout, }) => { - const avatar = ( - - ) + const avatar = return ( - +
{displayName}
diff --git a/src/layout/navbar/avatarDropdown/index.js b/src/layout/avatarDropdown/index.js similarity index 100% rename from src/layout/navbar/avatarDropdown/index.js rename to src/layout/avatarDropdown/index.js diff --git a/src/layout/brand/brand.jsx b/src/layout/brand/brand.jsx index 3c06d99ce..fed881299 100644 --- a/src/layout/brand/brand.jsx +++ b/src/layout/brand/brand.jsx @@ -9,6 +9,8 @@ import Portal from 'components/portals/portal' import withTheme from 'styles/themes/withTheme' import { withSizes } from 'styles/utils' +import AvatarDropdown from '../avatarDropdown' + import styles from './brand.module.css' const SidebarWrapper = withTheme(({ className, onClick, content }) => ( @@ -23,19 +25,19 @@ const Brand = ({ title, baseRoute, isTablet, isMobile, sidebar, className, }) => (
- {sidebar - && (isMobile || isTablet) && ( - ( - - - - )} - > - {({ hide }) => } - + {sidebar && (isMobile || isTablet) && ( + ( + + + + )} + > + {({ hide }) => } + )} {title} + {sidebar && (isMobile || isTablet) && }
) diff --git a/src/layout/brand/brand.module.css b/src/layout/brand/brand.module.css index 5a1885502..446ba4bf4 100644 --- a/src/layout/brand/brand.module.css +++ b/src/layout/brand/brand.module.css @@ -21,7 +21,11 @@ text-decoration: none; } -.brand > .burgerLink:hover { +.brand > .burgerLink { + width: 40px; +} + +.brand > .burgerLink:hover { color: var(--secondary-color-font); } @@ -31,4 +35,4 @@ .mobileSidebar { height: calc(100% - var(--layout-navbar-height)); -} \ No newline at end of file +} diff --git a/src/layout/navbar/navbar.jsx b/src/layout/navbar/navbar.jsx index c1d510e68..608bd8397 100644 --- a/src/layout/navbar/navbar.jsx +++ b/src/layout/navbar/navbar.jsx @@ -5,15 +5,13 @@ import cn from 'classnames' import IconLink from 'components/iconLink' import IconLabel from 'components/iconLabel' -import AvatarDropdown from './avatarDropdown' +import AvatarDropdown from '../avatarDropdown' import './navbar.css' const Navbar = ({ name, className }) => (