From 96512433477a6b32ac4e51e73899f82dc1c2a6e1 Mon Sep 17 00:00:00 2001 From: Artem Baskal Date: Tue, 15 Sep 2020 10:30:34 +0300 Subject: [PATCH] - client: Make dashboard card height constant Close #2039 Squashed commit of the following: commit 1d6dd461558403ea0ba813d5f665ecbaab9cd8ed Merge: 6ca80c91 2a5b0b8d Author: ArtemBaskal Date: Tue Sep 15 10:18:19 2020 +0300 Merge branch 'master' into fix/2039 commit 6ca80c9171da61a4bc02cec409299d0cfb96da49 Author: ArtemBaskal Date: Mon Sep 14 19:58:43 2020 +0300 Fix mobile media query commit 239c9ab29aaaef200bd2289fa116507ea5c2bf4c Author: ArtemBaskal Date: Mon Sep 14 13:59:39 2020 +0300 - client: Make dashboard card height constant --- client/src/components/Dashboard/index.js | 3 +-- client/src/components/ui/Card.css | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client/src/components/Dashboard/index.js b/client/src/components/Dashboard/index.js index 07d8f94f..4d229ffb 100644 --- a/client/src/components/Dashboard/index.js +++ b/client/src/components/Dashboard/index.js @@ -82,7 +82,7 @@ const Dashboard = ({ {statsProcessing && } - {!statsProcessing &&
+ {!statsProcessing &&
diff --git a/client/src/components/ui/Card.css b/client/src/components/ui/Card.css index 5930d881..eb8a7963 100644 --- a/client/src/components/ui/Card.css +++ b/client/src/components/ui/Card.css @@ -19,7 +19,7 @@ max-height: 17.5rem; } -.card-table-overflow--limited.clients__table { +.dashboard .card-table-overflow--limited { max-height: 18rem; } @@ -122,6 +122,12 @@ } } +@media (min-width: 992px) { + .dashboard .card:not(.card--full) { + height: 22rem; + } +} + .card .logs__cell--red { background-color: #fff4f2; }