Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/cowprotocol/cowswap into de…
Browse files Browse the repository at this point in the history
…velop

# Conflicts:
#	apps/cowswap-frontend/src/common/constants/theme.ts
#	apps/cowswap-frontend/src/legacy/state/cowToken/middleware.ts
#	apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.ts
#	apps/cowswap-frontend/src/modules/swap/containers/SwapWidget/index.tsx
#	libs/ui/src/pure/Layer3Banner/index.tsx
  • Loading branch information
shoom3301 committed Nov 1, 2023
2 parents 21b59b6 + 0c839bc commit 669a980
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 30 deletions.
10 changes: 5 additions & 5 deletions apps/cowswap-frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
property="og:description"
content="CoW Swap finds the lowest prices from all decentralized exchanges and DEX aggregators & saves you more with p2p trading and protection from MEV"
/>
<!-- TODO: change after halloween-->
<!-- <meta property="og:image" content="https://swap.cow.fi/images/og-meta-cowswap.png?v=2" />-->
<meta property="og:image" content="https://swap.cow.fi/images/og-meta-halloween.png?v=1" />

<meta property="og:image" content="https://swap.cow.fi/images/og-meta-cowswap.png?v=2" />
<!-- <meta property="og:image" content="https://swap.cow.fi/images/og-meta-halloween.png?v=1" />-->
<meta property="og:url" content="https://swap.cow.fi" />

<!-- Twitter media tags -->
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:site" content="@CoWSwap" />
<meta name="twitter:title" content="CoW Swap | The smartest way to trade cryptocurrencies" />
<!-- <meta name="twitter:image" content="https://swap.cow.fi/images/og-meta-cowswap.png?v=2" /> -->
<meta name="twitter:image" content="https://swap.cow.fi/images/og-meta-halloween.png?v=1" />
<meta name="twitter:image" content="https://swap.cow.fi/images/og-meta-cowswap.png?v=2" />
<!-- <meta name="twitter:image" content="https://swap.cow.fi/images/og-meta-halloween.png?v=1" />-->

</head>

Expand Down
4 changes: 2 additions & 2 deletions apps/cowswap-frontend/src/common/constants/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ export enum UI {
COLOR_BORDER = '--cow-color-border',
COLOR_CONTAINER_BG_01 = '--cow-container-bg-01',
COLOR_CONTAINER_BG_02 = '--cow-container-bg-02',

// Misc
MODAL_BACKDROP = '--cow-modal-backdrop',
BORDER_RADIUS_NORMAL = '--cow-border-radius-normal',
PADDING_NORMAL = '--cow-padding-normal',
BOX_SHADOW_NORMAL = '--cow-box-shadow-normal',

// Icons
ICON_SIZE_NORMAL = '--cow-icon-size-normal',
ICON_SIZE_SMALL = '--cow-icon-size-small',
Expand Down
1 change: 0 additions & 1 deletion libs/ui/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ export * from './pure/SelectDropdown'
export * from './pure/Tooltip'
export * from './pure/Popover'
export * from './pure/ExternalLink'
export * from './pure/Layer3Banner'
export * from './enum'
22 changes: 0 additions & 22 deletions libs/ui/src/pure/Layer3Banner/index.tsx

This file was deleted.

0 comments on commit 669a980

Please sign in to comment.