a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- client: Make dashboard card height constant 

Close #2039

Squashed commit of the following:

commit 1d6dd461558403ea0ba813d5f665ecbaab9cd8ed
Merge: 6ca80c91 2a5b0b8d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 15 10:18:19 2020 +0300

    Merge branch 'master' into fix/2039

commit 6ca80c9171da61a4bc02cec409299d0cfb96da49
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 19:58:43 2020 +0300

    Fix mobile media query

commit 239c9ab29aaaef200bd2289fa116507ea5c2bf4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 13:59:39 2020 +0300

    - client: Make dashboard card height constant
This commit is contained in:
Artem Baskal 2020-09-15 10:30:34 +03:00
parent 2a5b0b8da1
commit 9651243347
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/Dashboard/index.js
View File

@ -82,7 +82,7 @@ const Dashboard = ({
</div> </div>
</PageTitle> </PageTitle>
{statsProcessing && <Loading />} {statsProcessing && <Loading />}
{!statsProcessing && <div className="row row-cards"> {!statsProcessing && <div className="row row-cards dashboard">
<div className="col-lg-12"> <div className="col-lg-12">
<Statistics <Statistics
interval={stats.interval} interval={stats.interval}
@ -100,7 +100,6 @@ const Dashboard = ({
<div className="col-lg-6"> <div className="col-lg-6">
<Counters <Counters
subtitle={subtitle} subtitle={subtitle}
refreshButton={refreshButton} refreshButton={refreshButton}
/> />
</div> </div>

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

@ -19,7 +19,7 @@
max-height: 17.5rem; max-height: 17.5rem;
} }
.card-table-overflow--limited.clients__table { .dashboard .card-table-overflow--limited {
max-height: 18rem; max-height: 18rem;
} }
@ -122,6 +122,12 @@
} }
} }
@media (min-width: 992px) {
.dashboard .card:not(.card--full) {
height: 22rem;
}
}
.card .logs__cell--red { .card .logs__cell--red {
background-color: #fff4f2; background-color: #fff4f2;
} }