Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Profile minor fixes (PR #1604)
Browse files Browse the repository at this point in the history
Re-done the merging manually as I screw up and merged instead of
squash-merged

---

Squashed commit of the following:

commit e3de27a
Author: Maria Yablonskaya <[email protected]>
Date:   Thu Oct 21 12:17:38 2021 +0300

    fix header mob logo & minor fix

commit 5f4bd3d
Merge: ba2d58e a4a565a
Author: Maria Yablonskaya <[email protected]>
Date:   Thu Oct 21 12:04:46 2021 +0300

    Merge branch 'develop' of github.com:gnosis/cowswap into feature/1545-profile-ui-minors

commit ba2d58e
Author: Maria Yablonskaya <[email protected]>
Date:   Wed Oct 20 14:27:31 2021 +0300

    profile more minors fixed

commit 445a282
Merge: 574f7cf f790346
Author: Maria Yablonskaya <[email protected]>
Date:   Wed Oct 20 14:24:34 2021 +0300

    Merge branch 'develop' of github.com:gnosis/cowswap into feature/1545-profile-ui-minors

commit 574f7cf
Merge: 02e719d 32653d2
Author: Maria Yablonskaya <[email protected]>
Date:   Mon Oct 18 17:20:26 2021 +0300

    Merge branch 'feature/1545-profile-ui-minors' of github.com:gnosis/cowswap into feature/1545-profile-ui-minors

commit 02e719d
Author: Maria Yablonskaya <[email protected]>
Date:   Mon Oct 18 17:19:56 2021 +0300

    increase line-height

commit 47faa4a
Merge: 845d89a 2ccf897
Author: Maria Yablonskaya <[email protected]>
Date:   Mon Oct 18 17:11:58 2021 +0300

    Merge branch 'develop' of github.com:gnosis/cowswap into feature/1545-profile-ui-minors

commit 32653d2
Author: Lint Action <[email protected]>
Date:   Wed Oct 13 15:16:11 2021 +0000

    Fix code style issues with Prettier

commit 845d89a
Author: Maria Yablonskaya <[email protected]>
Date:   Wed Oct 13 18:06:02 2021 +0300

    profile minors fix
  • Loading branch information
Leandro Boscariol committed Oct 21, 2021
1 parent a200816 commit 967ef4f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/assets/styles/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
`
2 changes: 1 addition & 1 deletion src/custom/pages/Profile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function Profile() {
<span style={{ wordBreak: 'break-all', display: 'inline-block' }}>
{referralLink.prefix}
<strong>{referralLink.address}</strong>
<span style={{ display: 'inline-block', verticalAlign: 'middle' }}>
<span style={{ display: 'inline-block', verticalAlign: 'middle', marginLeft: 8 }}>
<Copy toCopy={referralLink.link} />
</span>
</span>
Expand Down
7 changes: 5 additions & 2 deletions src/custom/pages/Profile/styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: 14px;
`}
> .item {
width: 100%;
Expand Down Expand Up @@ -94,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};
Expand Down Expand Up @@ -129,12 +130,14 @@ export const FlexCol = styled.div`
justify-content: center;
strong {
font-size: 21px;
margin-top: 6px;
${({ theme }) => theme.mediaWidth.upToSmall`
font-size: 14px;
`}
}
span:not([role='img']) {
font-size: 14px;
color: ${({ theme }) => theme.text6};
line-height: 32px;
}
`
1 change: 1 addition & 0 deletions src/custom/theme/baseTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 967ef4f

Please sign in to comment.