From 16a78ea8cc8f1ab4707c454bf03d2990096fdd82 Mon Sep 17 00:00:00 2001
From: alfonsomthd <almartin@redhat.com>
Date: Thu, 27 Sep 2018 14:45:44 +0200
Subject: [PATCH] mgr/dashboard: New Landing Page: Milestone 2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Changed navigation menu dropdown arrows' color to white.

All cards (except logs) viewable at-a-glance in Full HD presentation mode.

CSS adjustments, refactor and cleanup.

Fixes: https://tracker.ceph.com/issues/27050

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---
 .../dashboard/health/health.component.html    |  6 ++--
 .../dashboard/health/health.component.scss    |  3 +-
 .../info-card/info-card.component.scss        | 32 ++++++++++---------
 .../mgr/dashboard/frontend/src/defaults.scss  |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
index a266dffd009..61695902e2c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
@@ -118,7 +118,7 @@
                     i18n-cardTitle
                     class="cd-col-5"
                     cardClass="card-medium"
-                    [contentClass]="(contentData.client_perf.read_op_per_sec + contentData.client_perf.write_op_per_sec) <= 0 ? 'content-medium content-highlight' : 'card-chart'"
+                    [contentClass]="(contentData.client_perf.read_op_per_sec + contentData.client_perf.write_op_per_sec) <= 0 ? 'content-medium content-highlight' : 'content-chart'"
                     *ngIf="contentData.client_perf">
         <cd-health-pie *ngIf="(contentData.client_perf.read_op_per_sec + contentData.client_perf.write_op_per_sec) > 0"
                        [data]="contentData"
@@ -171,7 +171,7 @@
                     i18n-cardTitle
                     class="cd-col-5"
                     cardClass="card-medium"
-                    contentClass="card-chart"
+                    contentClass="content-chart"
                     *ngIf="contentData.mon_status">
         <cd-health-pie [data]="contentData"
                        [isBytesData]="true"
@@ -202,7 +202,7 @@
                     i18n-cardTitle
                     class="cd-col-5"
                     cardClass="card-medium"
-                    contentClass="card-chart"
+                    contentClass="content-chart"
                     (click)="pgStatusTarget.toggle()">
         <ng-template #pgStatus>
           <p class="logs-link"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss
index d28d5689ba4..66791b49feb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss
@@ -36,7 +36,8 @@ $popover-text-font-size: 10px;
 }
 
 .info-group {
-  margin-bottom: 20px;
+  margin: 0;
+  padding: 0;
 }
 
 cd-info-card {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
index b03091f038c..32eead47d22 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
@@ -1,7 +1,7 @@
 @import '../../../../defaults';
 
-$card-height: 8vw;
-$card-medium-height: 13vw;
+$card-height: 6vw;
+$card-medium-height: 12vw;
 $card-font-min-width: 320px;
 $card-font-max-width: 1920px;
 $card-font-min-size: 12px;
@@ -42,7 +42,7 @@ $logs-text-font-size: $card-font-min-size;
   transform: translate(-50%);
 }
 
-.card-chart {
+.content-chart {
   position: unset;
   top: unset;
   left: unset;
@@ -91,34 +91,36 @@ $logs-text-font-size: $card-font-min-size;
   text-align: left;
 }
 
-@media (max-width: 991px) {
+@media (max-width: 1599px) {
   .card {
-    min-height: $card-height * 2;
+    min-height: $card-height * 1.3;
   }
 
   .card-medium {
-    min-height: $card-medium-height * 1.9;
+    min-height: $card-medium-height * 1.5;
   }
 }
 
-@media (min-width: 992px) {
+@media (max-width: 991px) {
   .card {
-    min-height: $card-height;
+    min-height: $card-height * 2;
   }
+}
 
+@media (max-width: 991px) and (min-width: 768px) {
   .card-medium {
-    min-height: $card-medium-height * 1.5;
+    min-height: $card-medium-height * 2.2;
   }
 }
 
-@media (min-width: 1200px) {
-  .card-medium {
-    min-height: $card-medium-height * 1.5;
+@media (max-width: 599px) {
+  .card {
+    min-height: $card-height * 3;
   }
 }
 
-@media (min-width: 1600px) {
-  .card-medium {
-    min-height: $card-medium-height;
+@media (max-width: 319px) {
+  .card {
+    min-height: $card-height * 4;
   }
 }
diff --git a/src/pybind/mgr/dashboard/frontend/src/defaults.scss b/src/pybind/mgr/dashboard/frontend/src/defaults.scss
index 9d9c09e21d3..f75f9c59d31 100644
--- a/src/pybind/mgr/dashboard/frontend/src/defaults.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/defaults.scss
@@ -47,7 +47,7 @@ $color-button-caret: $color-white-gray;
 $color-dropdown-menu: $color-dark-gray;
 $color-dropdown-active-text: $color-white-gray;
 $color-dropdown-active-bg: $color-blue;
-$color-caret-text: $color-blue;
+$color-caret-text: $color-solid-white;
 $color-progress-bar-info-bg: $color-blue;
 $color-progress-bar-freespace-bg: $color-light-gray;
 $color-oaprogress-text: $color-black;
-- 
2.39.5