daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: + client: Make default table height 100%

Browse Source 
Squashed commit of the following:

commit d6b07ae070b5ec826dbe3e226e326f9d52b8c7d1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 16:57:22 2020 +0300

    Limit dasboard tables height

commit 6b42f7a1e3cb82e1b792dd352717a3ffa9566b4b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 16:44:08 2020 +0300

    + client: Make default table height 100%
This commit is contained in:
Artem Baskal
2020-04-29 19:09:00 +03:00
parent ab1ab30e6f
commit 2837502a7b
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/Dashboard/BlockedDomains.js
View File

@@ -58,7 +58,7 @@ const BlockedDomains = ({
noDataText={t('no_domains_found')}
minRows={6}
defaultPageSize={100}
className="-highlight card-table-overflow stats__table"
className="-highlight card-table-overflow--limited stats__table"
/>
</Card>
);

2
client/src/components/Dashboard/Clients.js
View File

@@ -119,7 +119,7 @@ const Clients = ({
noDataText={t('no_clients_found')}
minRows={6}
defaultPageSize={100}
className="-highlight card-table-overflow clients__table"
className="-highlight card-table-overflow--limited clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};

2
client/src/components/Dashboard/QueriedDomains.js
View File

@@ -59,7 +59,7 @@ const QueriedDomains = ({
noDataText={t('no_domains_found')}
minRows={6}
defaultPageSize={100}
className="-highlight card-table-overflow stats__table"
className="-highlight card-table-overflow--limited stats__table"
/>
</Card>
);

5
client/src/components/ui/Card.css
View File

@@ -10,6 +10,11 @@
}
.card-table-overflow {
overflow-y: auto;
max-height: 100%;
}
.card-table-overflow--limited {
overflow-y: auto;
max-height: 280px;
}