From 845d89aef976ad07e9ef995d7e767759f739cc3f Mon Sep 17 00:00:00 2001 From: Maria Yablonskaya Date: Wed, 13 Oct 2021 18:06:02 +0300 Subject: [PATCH 1/5] profile minors fix --- src/assets/styles/styled.ts | 1 + src/custom/pages/Profile/index.tsx | 2 +- src/custom/pages/Profile/styled.tsx | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/styled.ts b/src/assets/styles/styled.ts index f0039d8b4..d06ec5da2 100644 --- a/src/assets/styles/styled.ts +++ b/src/assets/styles/styled.ts @@ -20,4 +20,5 @@ export const Txt = styled.span< ${({ theme, fs }) => theme.mediaWidth.upToMedium` font-size: ${fs ? fs * 0.8 : 12}px; `} + min-height: 22px; ` diff --git a/src/custom/pages/Profile/index.tsx b/src/custom/pages/Profile/index.tsx index 9383f8882..5ec15fba0 100644 --- a/src/custom/pages/Profile/index.tsx +++ b/src/custom/pages/Profile/index.tsx @@ -49,7 +49,7 @@ export default function Profile() { {referralLink.prefix} {referralLink.address} - + diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx index a2ca82d09..5f972d7d1 100644 --- a/src/custom/pages/Profile/styled.tsx +++ b/src/custom/pages/Profile/styled.tsx @@ -35,13 +35,14 @@ export const ChildWrapper = styled.div` flex-grow: 1; justify-content: center; border-radius: 21px; - padding: 15px; + padding: 20px; ${({ theme }) => theme.neumorphism.boxShadow}; background-color: ${({ theme }) => theme.bg7}; ${({ theme }) => theme.mediaWidth.upToSmall` grid-column-start: 1; grid-column-end: 2; width: 100%; + padding: 15px; `} > .item { width: 100%; @@ -129,6 +130,7 @@ export const FlexCol = styled.div` justify-content: center; strong { font-size: 21px; + line-height: 32px; ${({ theme }) => theme.mediaWidth.upToSmall` font-size: 14px; `} @@ -136,5 +138,6 @@ export const FlexCol = styled.div` span:not([role='img']) { font-size: 14px; color: ${({ theme }) => theme.text6}; + line-height: 32px; } ` From 32653d22a7c3a68ff0c3950a447e4d2802c60b16 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Wed, 13 Oct 2021 15:16:11 +0000 Subject: [PATCH 2/5] Fix code style issues with Prettier --- README.md | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9908fb364..0c2a257f7 100644 --- a/README.md +++ b/README.md @@ -85,18 +85,18 @@ Make a copy of `.env` named `.env.local`, this will allow you to set your own co Modify the environment variables in `.env.production`, or override them in build time. ### Price feeds + CowSwap tries to find the best price available onchain using some price feeds. All price feeds are enabled by default, but they can be individually disabled by using an environment variable: -| Name | Environment variable | Type | Description | -|---------------------|------------------------------------------|------------------------------|----------------------| -| **Gnosis Protocol** | `REACT_APP_PRICE_FEED_GP_ENABLED` | `boolean` (default = `true`) | [Gnosis Protocol](https://docs.cowswap.exchange/) price estimation. Used for all price estimation. | -| **Paraswap** | `REACT_APP_PRICE_FEED_PARASWAP_ENABLED` | `boolean` (default = `true`) | [Paraswap](https://paraswap.io/) price estimation. Used for all price estimations. | -| **0x** | `REACT_APP_PRICE_FEED_0X_ENABLED` | `boolean` (default = `true`) | [0x](https://0x.org/) price estimation. Used for all price estimation. | +| Name | Environment variable | Type | Description | +| ------------------- | ---------------------------------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------ | +| **Gnosis Protocol** | `REACT_APP_PRICE_FEED_GP_ENABLED` | `boolean` (default = `true`) | [Gnosis Protocol](https://docs.cowswap.exchange/) price estimation. Used for all price estimation. | +| **Paraswap** | `REACT_APP_PRICE_FEED_PARASWAP_ENABLED` | `boolean` (default = `true`) | [Paraswap](https://paraswap.io/) price estimation. Used for all price estimations. | +| **0x** | `REACT_APP_PRICE_FEED_0X_ENABLED` | `boolean` (default = `true`) | [0x](https://0x.org/) price estimation. Used for all price estimation. | | **Coingecko** | `REACT_APP_PRICE_FEED_COINGECKO_ENABLED` | `boolean` (default = `true`) | [Coingecko](coingecko.com) price estimation. Used only for USD estimations to calculate the slippage on the trade. | - ### Metadata attached to orders (AppData) The app will attach some metadata to all orders. diff --git a/package.json b/package.json index 34f9ea81e..eaed660fd 100644 --- a/package.json +++ b/package.json @@ -190,4 +190,4 @@ "react-router-hash-link": "^2.4.0", "timeago.js": "^4.0.2" } -} \ No newline at end of file +} From 02e719d423c7566cd8f518f78969d660e314ca84 Mon Sep 17 00:00:00 2001 From: Maria Yablonskaya Date: Mon, 18 Oct 2021 17:19:56 +0300 Subject: [PATCH 3/5] increase line-height --- src/custom/pages/Profile/styled.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx index ea973d144..321c1820f 100644 --- a/src/custom/pages/Profile/styled.tsx +++ b/src/custom/pages/Profile/styled.tsx @@ -130,7 +130,7 @@ export const FlexCol = styled.div` justify-content: center; strong { font-size: 21px; - line-height: 32px; + line-height: 40px; ${({ theme }) => theme.mediaWidth.upToSmall` font-size: 14px; `} From ba2d58e189fd3066c8fd5ad80a7256f7b65e471b Mon Sep 17 00:00:00 2001 From: Maria Yablonskaya Date: Wed, 20 Oct 2021 14:27:31 +0300 Subject: [PATCH 4/5] profile more minors fixed --- src/custom/pages/Profile/styled.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx index 321c1820f..fac6baaf6 100644 --- a/src/custom/pages/Profile/styled.tsx +++ b/src/custom/pages/Profile/styled.tsx @@ -42,7 +42,7 @@ export const ChildWrapper = styled.div` grid-column-start: 1; grid-column-end: 2; width: 100%; - padding: 15px; + padding: 14px; `} > .item { width: 100%; @@ -130,7 +130,7 @@ export const FlexCol = styled.div` justify-content: center; strong { font-size: 21px; - line-height: 40px; + margin-top: 6px; ${({ theme }) => theme.mediaWidth.upToSmall` font-size: 14px; `} From e3de27ad2028e2a79f9a5d2facd83c309e971ca6 Mon Sep 17 00:00:00 2001 From: Maria Yablonskaya Date: Thu, 21 Oct 2021 12:17:38 +0300 Subject: [PATCH 5/5] fix header mob logo & minor fix --- src/custom/pages/Profile/styled.tsx | 2 +- src/custom/theme/baseTheme.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/custom/pages/Profile/styled.tsx b/src/custom/pages/Profile/styled.tsx index fac6baaf6..840d364e2 100644 --- a/src/custom/pages/Profile/styled.tsx +++ b/src/custom/pages/Profile/styled.tsx @@ -95,7 +95,7 @@ export const StyledTitle = styled(Title)` export const ItemTitle = styled.h3` display: flex; align-items: center; - margin: 0 0 34px 0; + margin: 0 0 16px 0; font-size: 18px; line-height: 1.21; color: ${({ theme }) => theme.text1}; diff --git a/src/custom/theme/baseTheme.tsx b/src/custom/theme/baseTheme.tsx index 6e0f1016f..af1579013 100644 --- a/src/custom/theme/baseTheme.tsx +++ b/src/custom/theme/baseTheme.tsx @@ -115,6 +115,7 @@ export function themeVariables(darkMode: boolean, colorsTheme: Colors) { }, logo: { src: `data:image/svg+xml;base64,${cowSwapLogo(darkMode)}`, + srcIcon: `data:image/svg+xml;base64,${cowSwapLogo(darkMode, true)}`, alt: 'CowSwap Logo', width: '208px', height: '50px',