From 4115b62fce487a98698e045bed3ff858bc588cfa Mon Sep 17 00:00:00 2001 From: alekseevaiana Date: Mon, 22 Jul 2024 12:17:38 -0700 Subject: [PATCH 1/4] side menu fixed width --- src/components/NavLinks.tsx | 28 +++++++++++++--------------- src/components/SideMenu.tsx | 4 +--- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/components/NavLinks.tsx b/src/components/NavLinks.tsx index ec0e2e95..8f8c9e86 100644 --- a/src/components/NavLinks.tsx +++ b/src/components/NavLinks.tsx @@ -55,12 +55,11 @@ const Nav = styled.div` align-items: center; justify-content: center; height: 100%; - @media (max-width: 767px) { + @media (max-width: 1073px) { position: unset; transform: initial; flex-direction: column; } - ${({ theme }) => theme.mediaWidth.upToSmall``} ` const BtnStyle = css` @@ -102,19 +101,18 @@ const BtnStyle = css` margin-right: 0; } - ${({ theme }) => theme.mediaWidth.upToSmall` - flex: 0 0 100%; - min-width: 100%; - font-weight: normal; - padding: 15px 25px; - display: flex; - align-items:center; - text-align: left; - margin: 0; - color :${(props: any) => props.theme.colors.primary}; - font-size: ${(props: any) => props.theme.font.small}; - - `} + @media (max-width: 1073px) { + flex: 0 0 100%; + min-width: 100%; + font-weight: normal; + padding: 15px 25px; + display: flex; + align-items: center; + text-align: left; + margin: 0; + color: ${(props: any) => props.theme.colors.primary}; + font-size: ${(props: any) => props.theme.font.small}; + } ` const NavBarLink = styled(NavLink)` ${BtnStyle} diff --git a/src/components/SideMenu.tsx b/src/components/SideMenu.tsx index 4438d9c7..8c05c107 100644 --- a/src/components/SideMenu.tsx +++ b/src/components/SideMenu.tsx @@ -503,6 +503,7 @@ const Overlay = styled.div` const InnerContainer = styled.div` min-height: 100vh; width: calc(100% - 50px); + max-width: 364px; background: ${(props) => props.theme.colors.neutral}; padding-bottom: 1rem; position: relative; @@ -555,7 +556,4 @@ const Account = styled.div` display: flex; justify-content: center; cursor: pointer; - @media (max-width: 767px) { - justify-content: flex-start; - } ` From 6e566708283701bbae6de48f5e5849b39c5b0cad Mon Sep 17 00:00:00 2001 From: alekseevaiana Date: Thu, 25 Jul 2024 10:01:45 -0700 Subject: [PATCH 2/4] side menu display none id screen is wide --- src/components/SideMenu.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/SideMenu.tsx b/src/components/SideMenu.tsx index 8c05c107..76adf709 100644 --- a/src/components/SideMenu.tsx +++ b/src/components/SideMenu.tsx @@ -484,6 +484,10 @@ const Container = styled.div` opacity: 1; transition: all 300ms; } + + @media (min-width: 1073px) { + display: none; + } ` const Inner = styled.div` From 8bdf781478b72bcce18bcb5640efb7aa610185b3 Mon Sep 17 00:00:00 2001 From: alekseevaiana Date: Thu, 25 Jul 2024 10:53:55 -0700 Subject: [PATCH 3/4] fix account arrangement --- src/components/SideMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SideMenu.tsx b/src/components/SideMenu.tsx index 76adf709..cc13be97 100644 --- a/src/components/SideMenu.tsx +++ b/src/components/SideMenu.tsx @@ -558,6 +558,6 @@ const Address = styled.div` const Account = styled.div` display: flex; - justify-content: center; + justify-content: flex-start; cursor: pointer; ` From c1203265a4fe97860546f6b83b4a2d8c53d85dc1 Mon Sep 17 00:00:00 2001 From: alekseevaiana Date: Thu, 25 Jul 2024 10:58:29 -0700 Subject: [PATCH 4/4] change camelot link color --- src/components/Navbar.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 62cc80f3..0cd04f97 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -637,8 +637,11 @@ const InfoPopUpText = styled.div` const InfoPopUpSubText = styled.div` font-size: 13px; line-height: ${(props) => props.theme.font.xSmall}; - color: ${(props) => props.theme.colors.accent}; font-weight: 500; + + a { + color: ${(props) => props.theme.colors.accent}; + } ` const OdBalanceWrapper = styled.span`