Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update reversion in tables width #802

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Update reversion in tables width #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2370321
Revert "(improvements) Tables responsiveness"
ezewer Apr 5, 2024
3804689
Merge pull request #801 from bitfinexcom/revert-794-dynamic-table-width
ezewer Apr 5, 2024
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
1 change: 1 addition & 0 deletions src/components/AccountSummary/AccountSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class AccountSummary extends PureComponent {
/>
</>
)}
<br />
<PaidFees
t={t}
isNoData={isNoData}
Expand Down
13 changes: 3 additions & 10 deletions src/components/AccountSummary/AccountSummary.leo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,12 @@ const AccountSummaryLeo = ({

AccountSummaryLeo.propTypes = {
data: PropTypes.shape({
leoLev: PropTypes.number,
leoAmountAvg: PropTypes.number,
}),
leoLev: PropTypes.number.isRequired,
leoAmountAvg: PropTypes.number.isRequired,
}).isRequired,
t: PropTypes.func.isRequired,
isNoData: PropTypes.bool.isRequired,
isLoading: PropTypes.bool.isRequired,
}

AccountSummaryLeo.defaultProps = {
data: PropTypes.shape({
leoLev: 0,
leoAmountAvg: 0,
}),
}

export default memo(AccountSummaryLeo)
21 changes: 5 additions & 16 deletions src/components/AccountSummary/_AccountSummary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
.section-account-summary {
&-data {
width: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: row;
align-items: flex-end;
justify-content: space-between;
justify-content: flex-start;

&-item {
width: 49%;
min-width: 400px;
width: fit-content;
max-width: calc(100vw - 20px);
margin-right: 20px;
margin-bottom: 35px;

.collapsed-table {
Expand Down Expand Up @@ -50,16 +49,6 @@
}
}

@media screen and (max-width: 1210px) {
.section-account-summary {
&-data {
&-item {
width: 100%;
}
}
}
}

@media screen and (max-width: 768px) {
.section-account-summary {
&-data {
Expand All @@ -74,8 +63,8 @@
&-item {
width: 100%;
margin-right: 0;
min-width: inherit;
}
}
}
}

2 changes: 1 addition & 1 deletion src/components/AppSummary/AppSummary.value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const AccountSummaryValue = () => {
</div>
)}
<Chart
height={375}
aspect={1.5}
data={chartData}
showLegend={false}
dataKeys={presentCurrencies}
Expand Down
38 changes: 11 additions & 27 deletions src/components/AppSummary/_AppSummary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
&-data-row {
display: flex;
flex-wrap: wrap;
max-width: 100%;
max-width: 1000px;
min-height: 441px;
align-items: flex-start;
justify-content: space-between;
Expand All @@ -29,14 +29,14 @@
&-title-row {
display: flex;
min-height: 35px;
max-width: 100%;
max-width: 1000px;
align-items: center;
justify-content: space-between;
}

&-item {
width: 48%;
min-width: 300px;
max-width: 460px;
min-height: 270px;

&-title {
Expand Down Expand Up @@ -150,7 +150,7 @@

.app-summary-item-title--row {
display: flex;
max-width: 100%;
max-width: 1000px;
position: relative;
align-items: center;
justify-content: space-between;
Expand Down Expand Up @@ -348,15 +348,15 @@
.loading-container {
display: flex;
min-height: 300px;
max-width: 100%;
max-width: 1000px;

.loading {
margin: auto;
}
}

.no-data {
max-width: 100%;
max-width: 1000px;
min-height: 300px;

&-wrapper {
Expand All @@ -366,8 +366,8 @@
}

.chart-item {
width: 48%;
margin-right: 15px;
width: 50%;
max-width: 500px;

.app-summary-item-sub-title {
margin-bottom: 11px;
Expand Down Expand Up @@ -464,41 +464,25 @@
}
}

@media screen and (max-width: 1020px) {
@media screen and (max-width: 547px) {
.app-summary {
&-data-row {
display: flex;
flex-direction: column;
margin-bottom: 0;
}

&-item {
width: 100%;
margin-bottom: 30px;
}

.chart-item {
width: 100%;
margin-right: 0;
}
}
}

@media screen and (max-width: 855px) {
.app-summary {
&-item {
.line-chart {
width:107%;
}
}
}
}

@media screen and (max-width: 450px) {
@media screen and (max-width: 400px) {
.app-summary {
&-item {
.line-chart {
width:115%;
width:120%;
}
}
}
Expand Down
10 changes: 4 additions & 6 deletions src/components/ConcentrationRisk/ConcentrationRisk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,10 @@ class ConcentrationRisk extends PureComponent {
} else {
showContent = (
<div className='concentration-risk-data'>
<div className='concentration-risk-data-table'>
<DataTable
tableColumns={tableColumns}
numRows={isLoading ? 5 : tableData.length}
/>
</div>
<DataTable
tableColumns={tableColumns}
numRows={isLoading ? 5 : tableData.length}
/>
<div className='concentration-risk-data-chart'>
<PieChart data={chartData} />
</div>
Expand Down
26 changes: 7 additions & 19 deletions src/components/ConcentrationRisk/_ConcentrationRisk.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
.concentration-risk-data {
width: 100%;
display: flex;

&-table {
width: 50%;
margin-right: 100px;

.data-table-container {
flex: 0 0 400px;
height: fit-content;
}
.bitfinex-table {
height: fit-content;
flex: 0 0 400px;
}

&-chart {
width: 100%;
margin-left: 15px;

.recharts-wrapper {
Expand All @@ -28,19 +23,12 @@
}
}

@media screen and (max-width: 1020px) {
@media screen and (max-width: 850px) {
.concentration-risk-data {
flex-wrap: wrap;
flex-direction: column;
align-items: center;

&-table {
width: 100%;
margin-right: 0;

.bitfinex-table {
margin: 0 auto 25px auto;
}
.bitfinex-table {
margin: 0 auto 25px auto;
}

&-chart {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Snapshots/TickersSnapshot/TickersSnapshot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const TickersSnapshot = ({
})

return (
<div className='tickers'>
<>
<div className='tables-row no-table-scroll'>
<div className='tables-row-item'>
<div>{t('positions.title')}</div>
Expand All @@ -47,7 +47,7 @@ const TickersSnapshot = ({
/>
</div>
</div>
</div>
</>
)
}

Expand Down
26 changes: 0 additions & 26 deletions src/components/Snapshots/_Snapshots.scss
View file
Open in desktop

This file was deleted.

58 changes: 28 additions & 30 deletions src/components/Wallets/Wallets.data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,34 @@ const WalletsData = ({
})

return (
<div className='wallets'>
<div className='tables-row no-table-scroll'>
<div className='tables-row-item'>
<div>{t('wallets.header.exchange')}</div>
<DataTable
tableColumns={exchangeColumns}
numRows={exchangeData.length || 1}
/>
</div>
<div className='tables-row-item'>
<div>{t('wallets.header.margin')}</div>
<DataTable
tableColumns={marginColumns}
numRows={marginData.length || 1}
/>
</div>
<div className='tables-row-item'>
<div>{t('wallets.header.funding')}</div>
<DataTable
tableColumns={fundingColumns}
numRows={fundingData.length || 1}
/>
</div>
<div className='tables-row-item'>
<div>{t('wallets.header.capital-raise')}</div>
<DataTable
tableColumns={contributionColumns}
numRows={contributionData.length || 1}
/>
</div>
<div className='tables-row no-table-scroll'>
<div className='tables-row-item'>
<div>{t('wallets.header.exchange')}</div>
<DataTable
tableColumns={exchangeColumns}
numRows={exchangeData.length || 1}
/>
</div>
<div className='tables-row-item'>
<div>{t('wallets.header.margin')}</div>
<DataTable
tableColumns={marginColumns}
numRows={marginData.length || 1}
/>
</div>
<div className='tables-row-item'>
<div>{t('wallets.header.funding')}</div>
<DataTable
tableColumns={fundingColumns}
numRows={fundingData.length || 1}
/>
</div>
<div className='tables-row-item'>
<div>{t('wallets.header.capital-raise')}</div>
<DataTable
tableColumns={contributionColumns}
numRows={contributionData.length || 1}
/>
</div>
</div>
)
Expand Down
24 changes: 0 additions & 24 deletions src/components/Wallets/_Wallets.scss
View file
Open in desktop

This file was deleted.

Loading