diff --git a/src/components/Buttons/DropLink.jsx b/src/components/Buttons/DropLink.jsx
index cfc8e9e8..1576b5ac 100644
--- a/src/components/Buttons/DropLink.jsx
+++ b/src/components/Buttons/DropLink.jsx
@@ -1,40 +1,40 @@
-import { Button } from "@mui/material";
-import { styled } from "@mui/styles";
+import { Button } from '@mui/material';
+import { styled } from '@mui/styles';
const DropLink = styled(Button)(({ theme }) => ({
- color: '#2D3748',
- backgroundColor: 'transparent',
- width: 'fit-content',
- textDecoration: 'none',
- margin: '10px 25px',
- borderRadius: '24px',
- padding: '0 20px',
- fontSize: '16px',
- '& span': {
- borderRadius: '24px'
- },
- '& svg': {
- width: '36px',
- height: '36px',
- margin: '4px 0'
- },
- '&:hover': {
- backgroundColor: '#5286E9',
- color: '#fff'
- },
- '&:nth-child(1):hover svg path': {
- stroke: '#fff',
- fill: '#fff'
- },
- '&:nth-child(2):hover svg path': {
- stroke: '#fff'
- },
- '&:nth-child(3):hover svg path': {
- stroke: '#fff'
- },
- '&:nth-child(4):hover svg path': {
- stroke: '#fff'
- }
+ color: '#2D3748',
+ backgroundColor: 'transparent',
+ width: 'fit-content',
+ textDecoration: 'none',
+ margin: '10px 10px',
+ borderRadius: '24px',
+ padding: '0 20px',
+ fontSize: '16px',
+ '& span': {
+ borderRadius: '24px'
+ },
+ '& svg': {
+ width: '36px',
+ height: '36px',
+ margin: '4px 0'
+ },
+ '&:hover': {
+ backgroundColor: '#5286E9',
+ color: '#fff'
+ },
+ '&:nth-child(1):hover svg path': {
+ stroke: '#fff',
+ fill: '#fff'
+ },
+ '&:nth-child(2):hover svg path': {
+ stroke: '#fff'
+ },
+ '&:nth-child(3):hover svg path': {
+ stroke: '#fff'
+ },
+ '&:nth-child(4):hover svg path': {
+ stroke: '#fff'
+ }
}));
-export default DropLink;
\ No newline at end of file
+export default DropLink;
diff --git a/src/components/DesktopHead/DesktopHead.jsx b/src/components/DesktopHead/DesktopHead.jsx
index 74de972f..de9e40ec 100644
--- a/src/components/DesktopHead/DesktopHead.jsx
+++ b/src/components/DesktopHead/DesktopHead.jsx
@@ -5,144 +5,134 @@ import { ReactComponent as PhlaskIcon } from '../../components/icons/PHLASK_v2.s
import { ReactComponent as PhlaskNoTextIcon } from '../../components/icons/PhlaskNoText.svg';
import { ReactComponent as UsersIcon } from '../../components/icons/UsersIcon.svg';
import { ReactComponent as IDIcon } from '../../components/icons/ModalIDRequired.svg';
-import { ReactComponent as FilterIcon } from '../../components/icons/FilterIcon.svg';
-import { ReactComponent as SearchIcon } from '../../components/icons/SearchIcon.svg';
import { HeaderContext } from '../../contexts/HeaderContext';
import DropLink from '../../components/Buttons/DropLink';
-import {
- TOOLBAR_MODAL_FILTER,
- TOOLBAR_MODAL_NONE,
- TOOLBAR_MODAL_SEARCH,
-} from '../../actions/actions';
-export const DesktopHead = (props) => {
- const headerContext = React.useContext(HeaderContext);
- const {
- shownPage,
- menuClicked,
- toggleMenuExpand,
- menuExpand,
- setShowMapControls,
- showMapControls,
- pageExpand,
- verticalAnimFinished1,
- verticalAnimFinished2,
- setVerticalAnimFinished1,
- setVerticalAnimFinished2,
- } = headerContext;
- return (
-
- {
+ const headerContext = React.useContext(HeaderContext);
+ const {
+ shownPage,
+ menuClicked,
+ toggleMenuExpand,
+ menuExpand,
+ setShowMapControls,
+ showMapControls,
+ pageExpand,
+ verticalAnimFinished1,
+ verticalAnimFinished2,
+ setVerticalAnimFinished1,
+ setVerticalAnimFinished2
+ } = headerContext;
+ return (
+
+
+
+
+
+
+
+
+
+ {
+ if (pageExpand) {
+ setVerticalAnimFinished1(true);
+ }
+ }}
+ >
+
+
-
-
-
-
-
-
-
- {
- if (pageExpand) {
- setVerticalAnimFinished1(true);
- }
- }}
- >
-
-
-
-
- menuClicked('about')}
- startIcon={}
- data-cy="sidebar-about-button"
- >
- About
-
- menuClicked('join')}
- startIcon={}
- data-cy="sidebar-jointeam-button"
- >
- Join the team
-
- menuClicked('contact')}
- startIcon={}
- data-cy="sidebar-contact-button"
- >
- Contact
-
-
-
- {
- if (pageExpand) {
- setVerticalAnimFinished2(true);
- }
- }}
- >
-
-
-
-
-
- {verticalAnimFinished1 && verticalAnimFinished2 && shownPage}
-
-
-
+ menuClicked('about')}
+ startIcon={}
+ data-cy="sidebar-about-button"
+ >
+ About
+
+ menuClicked('join')}
+ startIcon={}
+ data-cy="sidebar-jointeam-button"
+ >
+ Join the team
+
+ menuClicked('contact')}
+ startIcon={}
+ data-cy="sidebar-contact-button"
+ >
+ Contact
+
+
+
+ {
+ if (pageExpand) {
+ setVerticalAnimFinished2(true);
+ }
+ }}
+ >
+
+
- );
-}
\ No newline at end of file
+
+
+ {verticalAnimFinished1 && verticalAnimFinished2 && shownPage}
+
+
+
+
+ );
+};
diff --git a/src/components/MobileHead/MobileHead.jsx b/src/components/MobileHead/MobileHead.jsx
index 0e811592..65cf953b 100644
--- a/src/components/MobileHead/MobileHead.jsx
+++ b/src/components/MobileHead/MobileHead.jsx
@@ -114,17 +114,6 @@ function MobileHead() {
- {
- if (pageExpand) {
- setVerticalAnimFinished1(true);
- }
- }}
- >
-
-
- {
- if (pageExpand) {
- setVerticalAnimFinished2(true);
- }
- }}
- >
-
-
-
-
- {verticalAnimFinished1 && verticalAnimFinished2 && shownPage}
-
-
);