a/badguardhome
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/package-lock.json generated vendored
View File

@ -2259,7 +2259,8 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
} }
} }
@ -3056,7 +3057,8 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
}, },
"micromatch": { "micromatch": {
@ -3688,7 +3690,8 @@
}, },
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true "dev": true
}, },
"normalize-path": { "normalize-path": {
@ -5288,7 +5291,8 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
} }
} }
@ -11525,7 +11529,8 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
} }
} }

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

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

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

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

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

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

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

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