From 63973d80404d93c93ae2d2a885ac452112792a9f Mon Sep 17 00:00:00 2001 From: fairlight <31534717+fairlighteth@users.noreply.github.com> Date: Thu, 2 Jun 2022 16:07:37 +0100 Subject: [PATCH] Improve header 5 (#603) * Improve FAQ text * Improve header 6 (#602) * connect button styling * Further flyout menu styling * Improve header 7 (#601) * Further flyout menu styling * Uniform menu items styling * Move styled components to styled * Add hamburger icon with animation component. * Improve header 8 (#600) * Add mediaQuery hook * Improve header 9 (#599) * Progress mobile responsive menu * Progress mobile responsive menu * Improve header 10 (#598) * Move to helper function * Optimise menu code * Improve header 11 (#597) * Move URLS to an ENUM * Fix enum issue. * Styling and route fixes. * Styling. * Styling. * Header/Menu improvement (waterfall PR FINAL) (#596) * Styling. * Styling footer and bridge banner. * Improve header 13 (#610) * Fix network selector position. * Fix exports/imports for network selector. * Only open ordersPanel if account is true. --- src/custom/assets/cow-swap/carret-down.svg | 3 + src/custom/assets/cow-swap/code.svg | 4 + src/custom/assets/cow-swap/discord.svg | 6 +- src/custom/assets/cow-swap/doc.svg | 4 + src/custom/assets/cow-swap/info.svg | 3 + src/custom/assets/cow-swap/menu.svg | 7 + src/custom/assets/cow-swap/moon.svg | 1 + src/custom/assets/cow-swap/pie.svg | 3 + src/custom/assets/cow-swap/sun.svg | 1 + src/custom/assets/cow-swap/twitter.svg | 6 +- .../Transaction/CancelationModal.tsx | 3 +- src/custom/components/AppziButton/index.tsx | 13 +- src/custom/components/ClickWrap/index.tsx | 7 +- .../components/CowBalanceButton/index.tsx | 33 +- .../components/CowProtocolLogo/index.tsx | 4 +- .../ErrorBoundary/ErrorBoundaryMod.tsx | 6 +- src/custom/components/Footer/index.tsx | 4 + src/custom/components/Header/HeaderMod.tsx | 8 +- .../Header/MobileMenuIcon/index.tsx | 82 ++++ .../NetworkSelector/NetworkSelectorMod.tsx | 10 +- .../Header/NetworkSelector/index.tsx | 33 +- src/custom/components/Header/index.tsx | 382 ++++++------------ src/custom/components/Header/styled.ts | 353 ++++++++++++++++ src/custom/components/MenuDropdown/index.tsx | 19 +- src/custom/components/MenuDropdown/styled.ts | 115 +++++- src/custom/components/OrdersPanel/index.tsx | 2 +- .../TransactionConfirmationModal/index.tsx | 3 +- src/custom/components/WalletModal/index.tsx | 3 +- src/custom/components/Web3Status/index.tsx | 31 +- src/custom/constants/index.ts | 2 +- src/custom/constants/mainMenu.ts | 77 ++++ src/custom/constants/routes.ts | 24 ++ src/custom/hooks/useChangeNetworks.ts | 2 +- src/custom/hooks/useMediaQuery.ts | 22 + src/custom/pages/About/index.tsx | 3 +- src/custom/pages/App/AppMod.tsx | 2 +- src/custom/pages/App/index.tsx | 66 ++- src/custom/pages/Claim/ClaimingStatus.tsx | 3 +- src/custom/pages/Faq/AffiliateFaq.tsx | 19 +- src/custom/pages/Faq/Menu.tsx | 11 +- src/custom/pages/Faq/TokenFaq.tsx | 9 +- src/custom/pages/Faq/index.tsx | 5 +- src/custom/pages/Swap/SwapMod.tsx | 11 +- src/custom/pages/Swap/styleds.tsx | 15 + src/custom/theme/baseTheme.tsx | 6 +- src/custom/theme/styled.d.ts | 2 + src/custom/utils/toggleBodyClass.ts | 7 + 47 files changed, 1034 insertions(+), 401 deletions(-) create mode 100644 src/custom/assets/cow-swap/carret-down.svg create mode 100644 src/custom/assets/cow-swap/code.svg create mode 100644 src/custom/assets/cow-swap/doc.svg create mode 100644 src/custom/assets/cow-swap/info.svg create mode 100644 src/custom/assets/cow-swap/menu.svg create mode 100644 src/custom/assets/cow-swap/moon.svg create mode 100644 src/custom/assets/cow-swap/pie.svg create mode 100644 src/custom/assets/cow-swap/sun.svg create mode 100644 src/custom/components/Header/MobileMenuIcon/index.tsx create mode 100644 src/custom/components/Header/styled.ts create mode 100644 src/custom/constants/mainMenu.ts create mode 100644 src/custom/constants/routes.ts create mode 100644 src/custom/hooks/useMediaQuery.ts create mode 100644 src/custom/utils/toggleBodyClass.ts diff --git a/src/custom/assets/cow-swap/carret-down.svg b/src/custom/assets/cow-swap/carret-down.svg new file mode 100644 index 0000000000..1831affe5b --- /dev/null +++ b/src/custom/assets/cow-swap/carret-down.svg @@ -0,0 +1,3 @@ + diff --git a/src/custom/assets/cow-swap/code.svg b/src/custom/assets/cow-swap/code.svg new file mode 100644 index 0000000000..2ced6ce64d --- /dev/null +++ b/src/custom/assets/cow-swap/code.svg @@ -0,0 +1,4 @@ + diff --git a/src/custom/assets/cow-swap/discord.svg b/src/custom/assets/cow-swap/discord.svg index 58721be551..734c765981 100644 --- a/src/custom/assets/cow-swap/discord.svg +++ b/src/custom/assets/cow-swap/discord.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/src/custom/assets/cow-swap/doc.svg b/src/custom/assets/cow-swap/doc.svg new file mode 100644 index 0000000000..673e82bb95 --- /dev/null +++ b/src/custom/assets/cow-swap/doc.svg @@ -0,0 +1,4 @@ + diff --git a/src/custom/assets/cow-swap/info.svg b/src/custom/assets/cow-swap/info.svg new file mode 100644 index 0000000000..3bc8b57bf4 --- /dev/null +++ b/src/custom/assets/cow-swap/info.svg @@ -0,0 +1,3 @@ + diff --git a/src/custom/assets/cow-swap/menu.svg b/src/custom/assets/cow-swap/menu.svg new file mode 100644 index 0000000000..b838f69f60 --- /dev/null +++ b/src/custom/assets/cow-swap/menu.svg @@ -0,0 +1,7 @@ + diff --git a/src/custom/assets/cow-swap/moon.svg b/src/custom/assets/cow-swap/moon.svg new file mode 100644 index 0000000000..d37991f2af --- /dev/null +++ b/src/custom/assets/cow-swap/moon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/custom/assets/cow-swap/pie.svg b/src/custom/assets/cow-swap/pie.svg new file mode 100644 index 0000000000..b6c9dcf6d9 --- /dev/null +++ b/src/custom/assets/cow-swap/pie.svg @@ -0,0 +1,3 @@ + diff --git a/src/custom/assets/cow-swap/sun.svg b/src/custom/assets/cow-swap/sun.svg new file mode 100644 index 0000000000..93e1029721 --- /dev/null +++ b/src/custom/assets/cow-swap/sun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/custom/assets/cow-swap/twitter.svg b/src/custom/assets/cow-swap/twitter.svg index 69882d6e27..7d68909264 100644 --- a/src/custom/assets/cow-swap/twitter.svg +++ b/src/custom/assets/cow-swap/twitter.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/src/custom/components/AccountDetails/Transaction/CancelationModal.tsx b/src/custom/components/AccountDetails/Transaction/CancelationModal.tsx index 98538b3d74..b18a1f7b29 100644 --- a/src/custom/components/AccountDetails/Transaction/CancelationModal.tsx +++ b/src/custom/components/AccountDetails/Transaction/CancelationModal.tsx @@ -12,6 +12,7 @@ import { TransactionErrorContent, } from 'components/TransactionConfirmationModal' import { CancellationSummary } from './styled' +import { Routes } from 'constants/routes' import { shortenOrderId } from 'utils' @@ -48,7 +49,7 @@ function RequestCancellationModal(props: RequestCancellationModalProps): JSX.Ele
This means that a solver might already have included the order in a solution even if this cancellation is successful. Read more in the{' '} - + FAQ . diff --git a/src/custom/components/AppziButton/index.tsx b/src/custom/components/AppziButton/index.tsx index b72c08710e..85d0639644 100644 --- a/src/custom/components/AppziButton/index.tsx +++ b/src/custom/components/AppziButton/index.tsx @@ -23,11 +23,14 @@ const Wrapper = styled(ButtonPrimary)` z-index: 2; ${({ theme }) => theme.mediaWidth.upToMedium` - bottom: 86px; - `}; - - ${({ theme }) => theme.mediaWidth.upToSmall` - right: 14px; + left: 14px; + height: 42px; + width: 42px; + bottom: 11px; + right: initial; + z-index: 10; + box-shadow: none; + border-width: 3px; `}; &::after { diff --git a/src/custom/components/ClickWrap/index.tsx b/src/custom/components/ClickWrap/index.tsx index 09852010b1..dcc39efd7e 100644 --- a/src/custom/components/ClickWrap/index.tsx +++ b/src/custom/components/ClickWrap/index.tsx @@ -1,6 +1,7 @@ import styled from 'styled-components/macro' import { NavLink } from 'react-router-dom' import { ButtonPrimary, ButtonOutlined } from 'components/Button' +import { Routes } from 'constants/routes' const Wrapper = styled.div` display: flex; @@ -111,9 +112,9 @@ export default function ClickWrap() {
We use cookies to provide you with the best experience and to help improve our website and application. Please
- read our