Skip to content

Commit

Permalink
Merge pull request #193 from Emurgo/add-dark-theme-colors
Browse files Browse the repository at this point in the history
Add dark theme colors
  • Loading branch information
vsubhuman authored Aug 19, 2024
2 parents d2bd2b1 + b47fec1 commit 4b1531e
Show file tree
Hide file tree
Showing 12 changed files with 308 additions and 266 deletions.
1 change: 1 addition & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const extractParams = (locationSearch: string): UrlParams => {
totalAda: Number(params.get('totalAda')),
layout: params.get('layout'),
bias: params.get('bias'),
theme: params.get('theme'),
};
};

Expand Down
19 changes: 10 additions & 9 deletions src/components/CardRoa.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const RoaElement = styled.div`
type Props = {|
roa: string,
description?: string,
isDark?: boolean,
|};

function CardRoa({ roa, description }: Props): Node {
Expand All @@ -31,17 +32,17 @@ function CardRoa({ roa, description }: Props): Node {
);
}

const RoaElementRevamp = styled.div`
height: 26px;
padding: 3px 0;
color: #242838;
font-size: 16px;
text-align: left;
`;
const RoaElementRevamp = styled('div')(({ isDark }) => ({
height: '26px',
padding: '3px 0',
color: isDark ? '#E1E6F5' : '#242838',
fontSize: '16px',
textAlign: 'left',
}));

function CardRoaRevamp({ roa, description }: Props): Node {
function CardRoaRevamp({ roa, description, isDark }: Props): Node {
return (
<RoaElementRevamp>
<RoaElementRevamp isDark={isDark}>
{description}
{parseFloat(roa) === 0 ? 'unknown' : `${parseFloat(roa).toFixed(2)}% `}
</RoaElementRevamp>
Expand Down
55 changes: 28 additions & 27 deletions src/components/CostsCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,35 @@ import React from 'react';
import type { Node } from 'react';
import styled from 'styled-components';

const Card = styled.div`
display: flex;
justify-content: flex-end;
font-size: 14px;
line-height: 22px;
@media (max-width: 1125px) {
flex-direction: column;
align-items: flex-start;
}
@media (min-width: 1125px) and (max-width: 1200px) {
flex-direction: column-reverse;
align-items: flex-end;
}
.value {
color: #242838;
font-size: 14px;
}
const Card = styled('div')(({ isDark }) => ({
display: 'flex',
justifyContent: 'flex-end',
fontSize: '14px',
lineHeight: '22px',
'@media (max-width: 1125px)': {
flexDirection: 'column',
alignItems: 'flex-start',
},
'@media (min-width: 1125px) and (max-width: 1200px)': {
flexDirection: 'column-reverse',
alignItems: 'flex-end',
},
'.value': {
color: isDark ? '#E1E6F5' : '#242838',
fontSize: '14px',
},
'&.cardRevamp': {
justifyContent: 'flex-start',
},
'.valueRevamp': {
color: isDark ? '#E1E6F5' : '#242838',
fontSize: '16px',
},
}));

&.cardRevamp {
justify-content: flex-start;
}
.valueRevamp {
color: #242838;
font-size: 16px;
}
`;
type Props = {|
value: string,
isDark?: boolean,
|};
function CostsCard({ value }: Props): Node {
return (
Expand All @@ -39,9 +40,9 @@ function CostsCard({ value }: Props): Node {
</Card>
);
}
function CostsCardRevamp({ value }: Props): Node {
function CostsCardRevamp({ value, isDark }: Props): Node {
return (
<Card className="cardRevamp">
<Card className="cardRevamp" isDark={isDark}>
<p className="valueRevamp">{value}</p>
</Card>
);
Expand Down
162 changes: 79 additions & 83 deletions src/components/DesktopTableRevamp.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,80 +21,73 @@ const TableContent = styled.div`
align-items: flex-end;
`;

const Table = styled.table`
width: 100%;
background: white;
border-spacing: 0 0.8rem;
position: relative;
table-layout: fixed;
tr td {
white-space: nowrap;
}
thead {
position: relative;
&:after {
content: '';
width: 100%;
height: 6px;
position: absolute;
left: 0;
right: 0;
bottom: 0;
border-bottom: 2px solid #f0f4f5;
}
th {
text-align: left;
color: #6b7384;
font-size: 14px;
letter-spacing: 0;
font-weight: 400;
padding: 12px 20px 16px 0;
&:first-child {
& > div:first-child {
padding-top: 18px;
}
}
}
}
tbody {
td {
&:not(:first-child) {
padding-right: 25px;
}
}
}
[class^='col'] {
width: 180px;
}
.col-0 {
width: 360px;
}
.col-1 {
width: 100px;
}
.col-2 {
width: 130px;
}
.col-3 {
width: 100px;
}
.col-4 {
width: 120px;
}
.col-5 {
width: 90px;
}
.col-6 {
width: 90px;
}
.col-7 {
width: 70px;
}
.col-last {
width: 120px;
}
`;
const Table = styled('table')(({ isDark }) => ({
width: '100%',
borderSpacing: '0 0.8rem',
position: 'relative',
tableLayout: 'fixed',
'tr td': {
whiteSpace: 'nowrap',
},
thead: {
position: 'relative',
'&:after': {
content: '""',
width: '100%',
height: '6px',
position: 'absolute',
left: 0,
right: 0,
bottom: 0,
borderBottom: isDark ? '2px solid #15171F' : '2px solid #f0f4f5',
},
th: {
textAlign: 'left',
fontSize: '14px',
letterSpacing: 0,
fontWeight: 400,
padding: '12px 20px 16px 0',
'&:first-child > div:first-child': {
paddingTop: '18px',
},
},
},
tbody: {
'td:not(:first-child)': {
paddingRight: '25px',
},
},
"[class^='col']": {
width: '180px',
},
'.col-0': {
width: '360px',
},
'.col-1': {
width: '100px',
},
'.col-2': {
width: '130px',
},
'.col-3': {
width: '100px',
},
'.col-4': {
width: '120px',
},
'.col-5': {
width: '90px',
},
'.col-6': {
width: '90px',
},
'.col-7': {
width: '70px',
},
'.col-last': {
width: '120px',
},
}));

const Message = styled.h1`
font-weight: 400;
Expand All @@ -109,6 +102,7 @@ type Props = {|
totalAda: ?number,
handleSort: Function,
activeSort: Object,
isDark: ?boolean,
|};

function DesktopTableRevamp({
Expand All @@ -119,6 +113,7 @@ function DesktopTableRevamp({
totalAda,
handleSort,
activeSort,
isDark,
}: Props): React$Node {
const isLoading = status === 'pending' || status === 'idle';
const isRejected = status === 'rejected';
Expand Down Expand Up @@ -184,7 +179,7 @@ function DesktopTableRevamp({

return (
<TableContent>
<Table>
<Table isDark={isDark}>
<thead>
<tr role="row">
{tableTheads.map(({ label, value, textInfo, id }) => {
Expand Down Expand Up @@ -222,24 +217,25 @@ function DesktopTableRevamp({
/>
</td>
<td>
<CardRoaRevamp roa={pool.roa} />
<CardRoaRevamp roa={pool.roa} isDark={!!isDark} />
</td>
<td>
<ValueRevamp>{formatBigNumber(pool.total_stake)}</ValueRevamp>
<ValueRevamp isDark={isDark}>{formatBigNumber(pool.total_stake)}</ValueRevamp>
</td>
<td>
<PoolSaturationTagRevamp value={pool.saturation} />
<PoolSaturationTagRevamp value={pool.saturation} isDark={!!isDark} />
</td>
<td>
<CostsCardRevamp
value={formatCostLabel(Number(pool.tax_ratio), pool.tax_fix)}
isDark={!!isDark}
/>
</td>
<td>
<PledgeCardRevamp value={pool.pledge} real={pool.pledge_real} />
</td>
<td>
<ValueRevamp>{pool.blocks_epoch}</ValueRevamp>
<ValueRevamp isDark={isDark}>{pool.blocks_epoch}</ValueRevamp>
</td>
<td>
<ButtonRevamp
Expand Down Expand Up @@ -269,7 +265,7 @@ function DesktopTableRevamp({

export default DesktopTableRevamp;

export const ValueRevamp: any = styled.div`
color: #242838;
font-size: 16px;
`;
export const ValueRevamp: any = styled('div')(({ isDark }) => ({
color: isDark ? '#E1E6F5' : '#242838',
fontSize: '16px',
}));
Loading

0 comments on commit 4b1531e

Please sign in to comment.