From 4a4fabcfd1b7ca51b1c6c79286632a6b9274482e Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Tue, 18 Jun 2019 16:51:05 +0300
Subject: [PATCH] Fixes bug on sidebar last line

---
 dmp-frontend/src/app/ui/sidebar/sidebar.component.html | 9 ++++++---
 dmp-frontend/src/app/ui/sidebar/sidebar.component.scss | 6 +++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
index fa6afc87b..e0e8fa1a2 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
@@ -53,10 +53,14 @@
 	<!-- END OF MOBILE MENU -->
 
 	<!-- Sidebar Menu -->
-	<ul class="nav" *ngFor="let groupMenuItem of groupMenuItems; last as isLast; first as isFirst"
+	<ul class="nav" *ngFor="let groupMenuItem of groupMenuItems; last as isLast; first as isFirst; let i = index"
 		[class.nav-list-item]="showItem(groupMenuItem)">
 		<div *ngIf="showItem(groupMenuItem);">
-			<div class="sidebarSubtitle">
+			<hr *ngIf="!isFirst">
+			<div *ngIf="isFirst" class="sidebarSubtitle firstSubtitle">
+				<p>{{groupMenuItem.title | translate}}</p>
+			</div>
+			<div *ngIf="!isFirst" class="sidebarSubtitle">
 				<p>{{groupMenuItem.title | translate}}</p>
 			</div>
 			<li routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" *ngFor="let groupMenuRoute of groupMenuItem.routes"
@@ -67,7 +71,6 @@
 					<p>{{groupMenuRoute.title | translate}}</p>
 				</a>
 			</li>
-			<hr *ngIf="!isLast && !groupMenuItem.requiresAdmin">
 		</div>
 	</ul>
 	<!-- Sidebar Footer -->
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss
index 515975a10..53b73e73a 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss
@@ -9,7 +9,7 @@ $mat-card-header-size: 30px !default;
 }
 
 .nav-list-item {
-  margin-top: 20px;
+//   margin-top: 20px;
 }
 
 .login {
@@ -19,3 +19,7 @@ $mat-card-header-size: 30px !default;
 .login-label {
   text-transform: uppercase;
 }
+
+.firstSubtitle {
+	margin-top: 20px;
+}