From 670fe26b55d49568a2192da11421ffa668f494e8 Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Thu, 6 Feb 2020 13:45:11 +0000
Subject: [PATCH] [Monitor Dashboard | Trunk]: Change css for sidebar height

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58062 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.component.html                    |  4 +--
 src/app/monitor/monitor.component.html        |  6 ++--
 .../stakeholder/stakeholder.component.html    |  6 +---
 src/app/topic/topic.component.html            |  6 +---
 src/assets/monitor-custom.css                 | 33 +++----------------
 src/assets/theme-assets/dashboard-custom.css  | 13 ++++++--
 6 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 3bc6b23..6c1b0de 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,13 +6,13 @@
          alt="BETA">
 
     <nav class="uk-navbar uk-light">
-      <div *ngIf="!open || !hasSidebar "  class="uk-navbar-left  uk-margin-small-left">
+      <!--<div *ngIf="!open || !hasSidebar "  class="uk-navbar-left  uk-margin-small-left">
         <div  class="uk-light uk-margin-small-top">
           <div *ngIf="stakeHolder" class="uk-text-bold uk-h4 uk-margin-remove-bottom" >{{stakeHolder.index_name}}</div>
           <div class="uk-h5 uk-margin-remove">{{(stakeHolder?'Admin Dashboard':'Monitor Dashboard')}}</div>
 
         </div>
-      </div>
+      </div>-->
       <div class="uk-navbar-right">
         <ul class="uk-navbar-nav user_actions">
           <li>
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 1684a6b..cfd8634 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -42,12 +42,12 @@
   <div class="sidebar_main_swipe  header_full" [class.sidebar_main_active]="open">
     <div id="header_main">
       <nav class="uk-light uk-navbar">
-        <div class="main_logo_top">
+        <!--<div class="main_logo_top">
           <div *ngIf="stakeholder && stakeholder.index_name" class=" uk-margin-small-top">
             <div class="uk-text-bold uk-h4 uk-margin-remove-bottom">{{stakeholder.index_name}}</div>
             <div class="uk-h5 uk-margin-remove">Monitor Dashboard</div>
           </div>
-        </div>
+        </div>-->
         <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
           <ul class="uk-navbar-nav">
             <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
@@ -87,7 +87,7 @@
             </div>
           </div>
         </div>
-        <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom"
+        <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom uk-margin-top"
              uk-height-match="target: div.md-card">
           <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
             <h4 class="uk-width-1-1">{{number.title}}</h4>
diff --git a/src/app/stakeholder/stakeholder.component.html b/src/app/stakeholder/stakeholder.component.html
index 74efd50..553c12d 100644
--- a/src/app/stakeholder/stakeholder.component.html
+++ b/src/app/stakeholder/stakeholder.component.html
@@ -3,11 +3,7 @@
     <img    class="badge"
          src="assets/theme-assets/prototype_flag.svg"
          alt="BETA">
-    <div class="uk-padding-small">
-      <img class="uk-margin-bottom" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
-      <h4 class="uk-text-bold uk-margin-remove">{{stakeholder.index_name}}</h4>
-      <span class="uk-text-large">Admin Dashboard</span>
-    </div>
+    <img class="logo" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
   </div>
   <div *ngIf="stakeholder" class="menu_section">
     <ul>
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html
index f5c3bd4..1bd3655 100644
--- a/src/app/topic/topic.component.html
+++ b/src/app/topic/topic.component.html
@@ -3,11 +3,7 @@
     <img    class="badge"
             src="assets/theme-assets/prototype_flag.svg"
             alt="BETA">
-    <div class="uk-padding-small">
-      <img class="uk-margin-bottom" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
-      <h4 class="uk-text-bold uk-margin-remove">{{stakeholder.index_name}}</h4>
-      <span class="uk-text-large">Admin Dashboard</span>
-    </div>
+    <img class="logo" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
   </div>
   <div *ngIf="stakeholder" class="menu_section">
     <ul>
diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css
index b3b7344..b8ed524 100644
--- a/src/assets/monitor-custom.css
+++ b/src/assets/monitor-custom.css
@@ -37,44 +37,23 @@
     transform: rotate(90deg);
 }
 
-/*monitor #header_main{*/
-/*    height: var(--monitor-header-height);*/
-/*}*/
-
-/*.dashboard monitor  .header_full #sidebar_main {*/
-/*    top: var(--monitor-header-height);*/
-
-/*}*/
-
 .double-header #header_menu a {
     user-select: none;
     -webkit-user-select: none;
     -moz-user-select: none;
 }
 
-.double-header  #header_main .uk-navbar-nav > li > a {
-    font-size: 20px;
-    font-family: 'Open Sans';
+.dashboard .double-header  #header_main .uk-navbar-nav > li > a {
+    font-size: 16px;
+    font-family: "Open Sans", serif;
 }
 
-/*.double-header .uk-navbar-nav > li.uk-active > a {*/
-/*    font-weight: bold;*/
-/*}*/
-/*.double-header #header_main .uk-navbar-nav > li.uk-active a span {*/
-/*    -webkit-box-shadow: inset 0 -2px 0 #FFFFFF;*/
-/*    box-shadow: inset 0 -2px 0 #FFFFFF;*/
-/*}*/
-
 .double-header #header_main .uk-navbar-nav > li.uk-active {
     position: relative;
     display: inline;
     transition:  position 0s linear 0.2s;
 }
 
-/*.double-header #header_main .uk-navbar-nav > li a:after {*/
-/*    border-color: transparent ;*/
-/*    border-width: 0px;*/
-/*}*/
 .double-header #header_main .uk-navbar-nav > li.uk-active a {
     font-weight: bold;
 }
@@ -128,12 +107,8 @@
     margin-top: calc(var(--header-height) + 24px);
 }
 
-.stakeholderPage  #sidebar_main .menu_section > ul li > a {
-    font-size: 18px;
-}
-
 .double-header .uk-logo img{
-    max-height: 80px;
+    max-height: calc(var(--header-height) - 20px);
 }
 
 .stakeholderPage #style_switcher {
diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css
index 7c832dc..f6d92b1 100644
--- a/src/assets/theme-assets/dashboard-custom.css
+++ b/src/assets/theme-assets/dashboard-custom.css
@@ -41,8 +41,15 @@ html .dashboard {
 }
 
 .dashboard #sidebar_main .sidebar_main_header {
-  height: auto;
-  min-height: var(--header-height);
+  height: var(--header-height);
+  border-bottom: none;
+}
+
+.dashboard #sidebar_main .sidebar_main_header .logo {
+  height: calc(var(--header-height) - 20px);
+  margin-left: 25px;
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
 .dashboard #sidebar_main .menu_section {
@@ -190,6 +197,8 @@ body.dashboard {
 }
 
 .dashboard #header_main {
+  -webkit-box-shadow: none;
+  box-shadow: none;
   height: var(--header-height);
 }