Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dapp-oeth/pages/_document.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ class MyDocument extends Document {
<meta
name="image"
content={
'https://cmsmediaproduction.s3.amazonaws.com/meta_9121c5630d.jpeg'
'https://cmsmediaproduction.s3.amazonaws.com/thumbnail_oeth_meta_ed53499f08.png'
}
/>
<meta property="og:url" content="https://ousd.com" />
<meta property="og:url" content="https://oeth.com" />
<meta property="og:type" content="website" />
<meta property="og:title" content="Origin Ether (OETH)" />
<meta
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dapp-oeth/public/images/reth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions dapp-oeth/public/images/reth.svg

This file was deleted.

Binary file modified dapp-oeth/public/images/share-facebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dapp-oeth/public/images/share-twitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dapp-oeth/public/images/weth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions dapp-oeth/public/images/weth.svg

This file was deleted.

2 changes: 2 additions & 0 deletions dapp-oeth/src/components/IPFSDappLink.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ export default function IPFSDappLink({ css }) {
background-color: #1e1f25;
color: #fafbfb;
padding: 0;
height: 36px;
}

.ipfs-link span {
padding: 8px 16px;
font-size: 12px;
}

.ipfs-image {
Expand Down
2 changes: 1 addition & 1 deletion dapp-oeth/src/components/MissionControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const MissionControl = ({}) => {

@media (max-width: 767px) {
.swap-contain {
padding: 0 8px;
padding: 0 12px;
}
}
`}</style>
Expand Down
3 changes: 1 addition & 2 deletions dapp-oeth/src/components/Nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ const DappLinks = ({ page }) => {
.link-contain {
font-size: 16px;
border-radius: 56px;
margin-right: 8px;
}

.link-contain.last {
Expand Down Expand Up @@ -888,7 +887,7 @@ const Nav = ({ isMobile, locale, onLocale, page }) => {

@media (max-width: 799px) {
.navbar .nav-container {
padding: 0 8px;
padding: 0 12px;
}
}
`}</style>
Expand Down
25 changes: 20 additions & 5 deletions dapp-oeth/src/components/buySell/BalanceHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const BalanceHeader = ({
src={assetRootPath(`/images/oeth.svg`)}
/>
)}
<p>{value}</p>
<p className={`${value != 0 ? 'white' : ''}`}>{value}</p>
{!small && (
<img
className="d-none d-md-block"
Expand All @@ -141,6 +141,10 @@ const BalanceHeader = ({
</div>
</div>
<style jsx>{`
.white {
color: #fafafb !important;
}

.containSmallTop {
border-top: 1px solid #141519;
}
Expand Down Expand Up @@ -205,7 +209,18 @@ const BalanceHeader = ({
justify-content: space-between;
align-items: center;
border-bottom: 0;
border-top: 1px solid black;
}

.containBig {
border-radius: 4px 4px 0 0;
}

.containSmall {
border-top: 1px solid #101113;
}

.containSmallTop {
border-radius: 0 0 4px 4px;
}

.containBig .title {
Expand Down Expand Up @@ -245,7 +260,7 @@ const BalanceHeader = ({
}

.stat .big {
font-size: 20px;
font-size: 24px;
}

.stat .small {
Expand Down Expand Up @@ -380,7 +395,7 @@ const BalanceHeader = ({
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
font-size: 20px;
font-size: 24px;
margin-bottom: 0;
}
}
Expand Down Expand Up @@ -621,7 +636,7 @@ const BalanceHeader = ({
.balance-header {
align-items: center;
text-align: center;
padding: 0px 8px;
padding: 0px 12px;
min-height: 80px;
}

Expand Down
4 changes: 4 additions & 0 deletions dapp-oeth/src/components/buySell/ContractsTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,10 @@ const ContractsTable = () => {
.contracts-main {
padding-bottom: 16px;
}

.contracts-wrapper {
border-radius: 4px;
}
}
`}</style>
</div>
Expand Down
16 changes: 14 additions & 2 deletions dapp-oeth/src/components/buySell/SettingsDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ const SettingsDropdown = ({ setPriceToleranceValue, priceToleranceValue }) => {
}

.settings-icon {
width: 22px;
height: 22px;
width: 16px;
height: 16px;
cursor: pointer;
}

Expand Down Expand Up @@ -161,6 +161,18 @@ const SettingsDropdown = ({ setPriceToleranceValue, priceToleranceValue }) => {
padding: 0 12px;
}

/* Chrome, Safari, Edge, Opera */
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}

/* Firefox */
input[type='number'] {
-moz-appearance: textfield;
}

.warning {
font-size: 14px;
color: #ffdc86;
Expand Down
48 changes: 41 additions & 7 deletions dapp-oeth/src/components/buySell/SwapCurrencyPill.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,22 @@ import { event } from '../../../lib/gtm'

const CoinImage = ({ small, coin }) => {
const className = `coin-image`

const coinExt = {
reth: 'png',
weth: 'png',
}

return (
<div className="d-flex align-items-center">
{coin !== 'mix' && (
<img
className={`${className} ${small ? 'small' : ''}`}
src={assetRootPath(`/images/currency/${coin}-icon-small.svg`)}
src={assetRootPath(
`/images/currency/${coin}-icon-small.${
coinExt[coin] ? coinExt[coin] : 'svg'
}`
)}
/>
)}
{coin === 'mix' && (
Expand All @@ -32,7 +42,7 @@ const CoinImage = ({ small, coin }) => {
/>
<img
className={`${className} mixed coin-2 ${small ? 'small' : ''}`}
src={assetRootPath(`/images/currency/reth-icon-small.svg`)}
src={assetRootPath(`/images/currency/reth-icon-small.png`)}
/>
<img
className={`${className} mixed coin-3 ${small ? 'small' : ''}`}
Expand Down Expand Up @@ -81,6 +91,8 @@ const CoinImage = ({ small, coin }) => {

@media (max-width: 799px) {
.coin-image {
width: 24px;
height: 24px;
margin-right: 8px;
}
}
Expand Down Expand Up @@ -353,9 +365,10 @@ const CoinSelect = ({

@media (max-width: 799px) {
.coin-select {
font-size: 16px;
width: fit-content;
min-height: 32px;
padding: 4px;
padding: 6px 4px;
margin-top: 16px;
}
}
Expand Down Expand Up @@ -399,7 +412,7 @@ const CoinSelect = ({
.coin-select {
padding: 4px;
border-radius: 30px;
border: solid 1px #141519;
border: solid 0px;
color: #fafbfb;
background-color: rgba(255, 255, 255, 0.1);
cursor: pointer;
Expand Down Expand Up @@ -436,15 +449,17 @@ const CoinSelect = ({

@media (max-width: 799px) {
.coin-select {
font-size: 16px;
width: fit-content;
min-height: 32px;
padding: 4px;
padding: 6px 4px;
margin-top: 16px;
}

.coin {
color: #fafbfb;
margin-right: 8px;
font-size: 16px;
}
}
`}</style>
Expand Down Expand Up @@ -645,7 +660,7 @@ const SwapCurrencyPill = ({
)}

{bottomItem && (
<div className="expected-value">
<div className={`expected-value ${expectedAmount ? '' : 'grey'}`}>
{swapsLoading ? (
<span className="text-loading">
{fbt('Loading...', 'Swaps Loading...')}
Expand Down Expand Up @@ -741,6 +756,10 @@ const SwapCurrencyPill = ({
)}
</div>
<style jsx>{`
.grey {
color: #828699 !important;
}

.output-holder {
max-width: 50%;
}
Expand Down Expand Up @@ -769,7 +788,6 @@ const SwapCurrencyPill = ({
.usd-balance {
font-size: 16px;
color: #828699;
margin-left: 4px;
overflow: hidden;
width: 100%;
display: block;
Expand Down Expand Up @@ -814,6 +832,22 @@ const SwapCurrencyPill = ({
font-size: 32px;
color: #fafbfb;
background-color: transparent;
padding: 0;
}

input::placeholder {
/* Chrome, Firefox, Opera, Safari 10.1+ */
color: #828699;
}

input:-ms-input-placeholder {
/* Internet Explorer 10-11 */
color: #828699;
}

input::-ms-input-placeholder {
/* Microsoft Edge */
color: #828699;
}

.expected-value {
Expand Down
26 changes: 19 additions & 7 deletions dapp-oeth/src/components/buySell/_PillArrow.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,31 @@ const PillArrow = ({ swapMode, setSwapMode }) => {
<img
src={assetRootPath('/images/splitarrow.svg')}
alt="swap arrow"
style={{ height: 25, width: 14 }}
style={{ height: 23, width: 12 }}
/>
</div>
</div>
<style jsx>{`
.pill-arrow {
width: 46px;
height: 46px;
width: 48px;
height: 48px;
border: 1px solid #141519;
background-color: #1e1f25;
border-radius: 50px;
margin-top: -23px;
transform: translateY(-50%);
z-index: 1;
}

.border-divider {
height: 10px;
background-color: #1e1f25;
width: 40px;
width: 24px;
z-index: 1;
}

.caret-background {
width: 46px;
height: 46px;
width: 48px;
height: 48px;
border: solid 1px #141519;
background-color: transparent;
z-index: 2;
Expand All @@ -83,6 +83,18 @@ const PillArrow = ({ swapMode, setSwapMode }) => {
.caret-background:hover {
background-color: #18191c;
}

@media (max-width: 799px) {
.caret-background {
width: 32px;
height: 32px;
}

.pill-arrow {
width: 32px;
height: 32px;
}
}
`}</style>
</div>
)
Expand Down
4 changes: 2 additions & 2 deletions dapp-oeth/src/components/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ const Layout = ({
<meta
property="og:image"
key="og:image"
content="https://ousd.com/images/share-facebook.png"
content={assetRootPath('/images/share-facebook.png')}
/>
<meta
name="twitter:image"
key="twitter:image"
content="https://ousd.com/images/share-twitter.png"
content={assetRootPath('/images/share-twitter.png')}
/>
</Head>

Expand Down
Loading