Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c6b316c
Add colors and type and fix everywhere
callil Jul 18, 2023
33fa98b
fix text.tsx
callil Jul 18, 2023
fa9f0d6
Color and text adjustments
callil Jul 18, 2023
1dcc919
Further tweaks
callil Jul 19, 2023
e6d0d2b
Merge branch 'main' into spore-colors
callil Jul 19, 2023
c4a8a0a
Removed promotional gradient
pp-hh-ii-ll Jul 19, 2023
10e5034
Add new icons and tweak broken colors
callil Jul 19, 2023
02b2efb
Merge branch 'spore-colors' of https://github.com/Uniswap/interface i…
callil Jul 19, 2023
3be72b8
Merge branch 'main' into spore-colors
callil Jul 19, 2023
d125f4f
Kill shadows
pp-hh-ii-ll Jul 20, 2023
d94865a
Update icons
pp-hh-ii-ll Jul 20, 2023
01b53dd
Update bag icon
pp-hh-ii-ll Jul 20, 2023
7e35d93
Change share icon
pp-hh-ii-ll Jul 20, 2023
2484ec7
Merge branch 'main' into spore-colors
callil Jul 24, 2023
9690d94
Fix merge errors
callil Jul 24, 2023
5f4425c
update tests
callil Jul 24, 2023
39de33d
Complete find and replace old colors
callil Jul 25, 2023
97c4da9
Merge branch 'main' into spore-colors-complete
callil Jul 25, 2023
1d438e0
Fix colors on pool pages
callil Jul 25, 2023
d140f67
Update index.test.tsx.snap
callil Jul 25, 2023
f15950f
fix header hover states
callil Jul 25, 2023
9dc64cf
update test
callil Jul 25, 2023
1a453cc
Update connect button hover state
callil Jul 25, 2023
c43d157
Merge branch 'main' into spore-colors-complete
callil Jul 25, 2023
59412ae
Update styles design bash
callil Jul 25, 2023
05250ca
Update tests
callil Jul 25, 2023
28e3256
Merge branch 'main' into spore-colors-complete
callil Jul 25, 2023
fc51b49
Merge branch 'main' into spore-colors-complete
callil Jul 26, 2023
9b49858
Merge branch 'main' into spore-colors-complete
callil Jul 26, 2023
45bf5a5
Update fonts
callil Jul 27, 2023
d9f1b7b
Merge branch 'main' into spore-colors-complete
callil Jul 27, 2023
3b1300a
fix buy button font weight
callil Jul 27, 2023
3145420
Merge branch 'main' into spore-colors-complete
callil Jul 27, 2023
dd138ec
update tests
callil Jul 27, 2023
392b004
fix jumping input boxes
callil Jul 27, 2023
5b8ed39
Merge branch 'main' into spore-colors-complete
callil Jul 27, 2023
85b253f
Merge branch 'main' into spore-colors-complete
callil Jul 28, 2023
4d18174
Merge branch 'main' into spore-colors-complete
callil Jul 28, 2023
a5e999b
Merge pull request #1 from callil/spore-colors-complete
callil Jul 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cypress/e2e/remove-liquidity.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
describe('Remove Liquidity', () => {
describe('Remove liquidity', () => {
it('eth remove', () => {
cy.visit('/remove/v2/ETH/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984')
cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'ETH')
Expand Down
Binary file not shown.
Binary file removed public/fonts/Inter-roman.var.woff2
Binary file not shown.
22 changes: 13 additions & 9 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,33 @@
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

<link rel="preload" href="%PUBLIC_URL%/fonts/Inter-roman.var.woff2" as="font" type="font/woff2" crossorigin />
<!-- <link rel="preload" href="%PUBLIC_URL%/fonts/Inter-roman.var.woff2" as="font" type="font/woff2" crossorigin /> -->
<link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Grotesk-Essential-Variable.woff" as="font" type="font/woff" crossorigin />


<style>
* {
font-family: 'Inter', sans-serif;
font-family: 'Basel', sans-serif;
box-sizing: border-box;
}

/**
Explicitly load Inter var from public/ so it does not block LCP's critical path.
*/
@font-face {
font-family: 'Inter custom';
font-family: 'Basel';
font-weight: 100 900;
font-style: normal;
font-display: block;
font-named-instance: 'Regular';
src: url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format('woff2-variations'),
url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format('woff2');
font-named-instance: 'Book';
src:
url(%PUBLIC_URL%/fonts/Basel-Grotesk-Essential-Variable.woff) format('woff');
}

@supports (font-variation-settings: normal) {
* {
font-family: 'Inter custom', sans-serif;
font-family: 'Basel', sans-serif;

}
}

Expand All @@ -77,9 +79,11 @@

html {
font-size: 16px;
font-weight: 485;
font-variant: none;
font-smooth: always;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility !important;
-webkit-font-smoothing: antialiased !important;
-moz-osx-font-smoothing: grayscale;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
Expand Down
3 changes: 3 additions & 0 deletions src/assets/images/buy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions src/assets/images/gas-icon.svg

This file was deleted.

3 changes: 3 additions & 0 deletions src/assets/svg/arrow-change-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/arrow-change-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/bag.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions src/assets/svg/eye.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/filter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/gas-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/power.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/assets/svg/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/svg/share.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/components/About/AboutFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,26 @@ const LinkGroup = styled.div`
const LinkGroupTitle = styled.span`
font-size: 16px;
line-height: 20px;
font-weight: 700;
font-weight: 535;
`

const ExternalTextLink = styled(ExternalLink)`
font-size: 16px;
line-height: 20px;
color: ${({ theme }) => theme.textSecondary};
color: ${({ theme }) => theme.neutral2};
`

const TextLink = styled(StyledRouterLink)`
font-size: 16px;
line-height: 20px;
color: ${({ theme }) => theme.textSecondary};
color: ${({ theme }) => theme.neutral2};
`

const Copyright = styled.span`
font-size: 16px;
line-height: 20px;
margin: 1rem 0 0 0;
color: ${({ theme }) => theme.textTertiary};
color: ${({ theme }) => theme.neutral3};
`

const LogoSectionContent = () => {
Expand Down
21 changes: 10 additions & 11 deletions src/components/About/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ const StyledCard = styled.div<{ $isDarkMode: boolean; $backgroundImgSrc?: string
display: flex;
background: ${({ $isDarkMode, $backgroundImgSrc, $type, theme }) =>
$isDarkMode
? `${$type === CardType.Primary ? theme.backgroundModule : theme.backgroundSurface} ${
? `${$type === CardType.Primary ? theme.surface2 : theme.surface1} ${
$backgroundImgSrc ? ` url(${$backgroundImgSrc})` : ''
}`
: `${$type === CardType.Primary ? 'white' : theme.backgroundModule} url(${$backgroundImgSrc})`};
: `${$type === CardType.Primary ? 'white' : theme.surface2} url(${$backgroundImgSrc})`};
background-size: auto 100%;
background-position: right;
background-repeat: no-repeat;
Expand All @@ -26,16 +26,15 @@ const StyledCard = styled.div<{ $isDarkMode: boolean; $backgroundImgSrc?: string
flex-direction: column;
justify-content: space-between;
text-decoration: none;
color: ${({ theme }) => theme.textPrimary};
color: ${({ theme }) => theme.neutral1};
padding: 24px;
height: 212px;
border-radius: 24px;
border: 1px solid ${({ theme, $type }) => ($type === CardType.Primary ? 'transparent' : theme.backgroundOutline)};
box-shadow: 0px 10px 24px 0px rgba(51, 53, 72, 0.04);
border: 1px solid ${({ theme, $type }) => ($type === CardType.Primary ? 'transparent' : theme.surface3)};
transition: ${({ theme }) => `${theme.transition.duration.medium} ${theme.transition.timing.ease} border`};

&:hover {
border: 1px solid ${({ theme, $isDarkMode }) => ($isDarkMode ? theme.backgroundInteractive : theme.textTertiary)};
border: 1px solid ${({ theme, $isDarkMode }) => ($isDarkMode ? theme.surface3 : theme.neutral3)};
}
@media screen and (min-width: ${BREAKPOINTS.sm}px) {
height: ${({ $backgroundImgSrc }) => ($backgroundImgSrc ? 360 : 260)}px;
Expand All @@ -54,7 +53,7 @@ const TitleRow = styled.div`
const CardTitle = styled.div`
font-size: 20px;
line-height: 28px;
font-weight: 600;
font-weight: 535;

@media screen and (min-width: ${BREAKPOINTS.lg}px) {
font-size: 28px;
Expand All @@ -65,9 +64,9 @@ const CardTitle = styled.div`
const getCardDescriptionColor = (type: CardType, theme: DefaultTheme) => {
switch (type) {
case CardType.Secondary:
return theme.textSecondary
return theme.neutral2
default:
return theme.textPrimary
return theme.neutral1
}
}

Expand All @@ -88,8 +87,8 @@ const CardDescription = styled.div<{ type: CardType }>`
`

const CardCTA = styled(CardDescription)`
color: ${({ theme }) => theme.accentAction};
font-weight: 500;
color: ${({ theme }) => theme.accent1};
font-weight: 535;
margin: 24px 0 0;
cursor: pointer;

Expand Down
4 changes: 2 additions & 2 deletions src/components/About/ProtocolBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const TextContainer = styled.div`
`

const HeaderText = styled.div`
font-weight: 700;
font-weight: 535;
font-size: 28px;
line-height: 36px;

Expand All @@ -53,7 +53,7 @@ const HeaderText = styled.div`

const DescriptionText = styled.div`
margin: 10px 10px 0 0;
font-weight: 500;
font-weight: 535;
font-size: 16px;
line-height: 20px;

Expand Down
4 changes: 2 additions & 2 deletions src/components/About/constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const MORE_CARDS = [
external: true,
title: 'Buy crypto',
description: 'Buy crypto with your credit card or bank account at the best rates.',
lightIcon: <DollarSign color={lightTheme.textTertiary} size={48} />,
lightIcon: <DollarSign color={lightTheme.neutral3} size={48} />,
darkIcon: <StyledCardLogo src={darkDollarImgSrc} alt="Earn" />,
cta: 'Buy now',
elementName: InterfaceElementName.ABOUT_PAGE_BUY_CRYPTO_CARD,
Expand All @@ -63,7 +63,7 @@ export const MORE_CARDS = [
external: true,
title: 'Build dApps',
description: 'Build apps and tools on the largest DeFi protocol on Ethereum.',
lightIcon: <Terminal color={lightTheme.textTertiary} size={48} />,
lightIcon: <Terminal color={lightTheme.neutral3} size={48} />,
darkIcon: <StyledCardLogo src={darkTerminalImgSrc} alt="Developers" />,
cta: 'Developer docs',
elementName: InterfaceElementName.ABOUT_PAGE_DEV_DOCS_CARD,
Expand Down
Loading