From 385fcc25881c64aec4bbe6b14fa25934c6dbf3c3 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 26 Apr 2019 10:37:40 +0200
Subject: [PATCH] FIX #10387 TIME 0:20 align profile firstname / lastname

---
 src/frontend/app/header/header-right.component.html | 4 ++--
 src/frontend/app/header/header-right.component.scss | 6 ------
 src/frontend/app/menu/main-header.component.html    | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/frontend/app/header/header-right.component.html b/src/frontend/app/header/header-right.component.html
index fd90fe7f152..e2a48935f7e 100644
--- a/src/frontend/app/header/header-right.component.html
+++ b/src/frontend/app/header/header-right.component.html
@@ -29,9 +29,9 @@
             </button>
         </ng-container>
     </mat-menu>
-    <button *ngIf="!mobileMode" mat-button [matMenuTriggerFor]="menu" class="userProfilButtom">
+    <button *ngIf="!mobileMode" mat-button [matMenuTriggerFor]="menu">
         <mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon>
-        {{headerService.user.firstname | titlecase }} <b>{{headerService.user.lastname | uppercase}}</b>
+        <span>{{headerService.user.firstname | titlecase }}</span>&nbsp;<b>{{headerService.user.lastname | uppercase}}</b>
     </button>
     <button *ngIf="mobileMode" mat-icon-button [matMenuTriggerFor]="menu">
         <mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white;height: auto;"></mat-icon>
diff --git a/src/frontend/app/header/header-right.component.scss b/src/frontend/app/header/header-right.component.scss
index a484d3bd9de..49854ef6466 100644
--- a/src/frontend/app/header/header-right.component.scss
+++ b/src/frontend/app/header/header-right.component.scss
@@ -10,10 +10,4 @@
         font-size: 12px;
         opacity: 0.5;
     }
-}
-
-.userProfilButtom {
-    ::ng-deep.mat-button-wrapper {
-        vertical-align: middle;
-    }
 }
\ No newline at end of file
diff --git a/src/frontend/app/menu/main-header.component.html b/src/frontend/app/menu/main-header.component.html
index d450efa33df..0e12ad061b6 100755
--- a/src/frontend/app/menu/main-header.component.html
+++ b/src/frontend/app/menu/main-header.component.html
@@ -18,7 +18,7 @@
         </ng-container>
     </mat-menu>
     <button mat-button [matMenuTriggerFor]="menu" *ngIf="!mobileMode">
-        <mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon>{{headerService.user.firstname | titlecase }} <b>{{headerService.user.lastname | uppercase}}</b></button>
+        <mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon><span>{{headerService.user.firstname | titlecase }}</span>&nbsp;<b>{{headerService.user.lastname | uppercase}}</b></button>
     <mat-menu #menu="matMenu" class="headerMaarch">
         <canvas class="header-bg" width="250" height="70" style="margin-top:-8px;background-image: url('static.php?filename=login-banner.jpg');background-size:cover;border-bottom: solid 1px white;"></canvas>
         <i title="{{lang.myProfileAccess}}" routerLink="/profile" style="cursor:pointer;z-index:1;color:white;position: absolute;left: 85px;top: 17px;background-image: url('static.php?filename=logo_only.svg');width: 70px;height: 70px;background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"></i>
-- 
GitLab