From 3cbe302b544922dca90b86d8c91c35b9da397e9a Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Wed, 11 Jul 2018 10:29:21 +0300
Subject: [PATCH] (Toolbar) Changed the username + Small margin tweaks (Navbar)
 Style variant 2 adjustments and tweaks

---
 .../vertical/style-1/style-1.component.html   |  1 +
 .../vertical/style-1/style-1.component.scss   | 19 +++++++++++++++++++
 .../vertical/style-1/style-1.component.ts     |  2 +-
 .../components/toolbar/toolbar.component.html |  4 ++--
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/app/layout/components/navbar/vertical/style-1/style-1.component.html b/src/app/layout/components/navbar/vertical/style-1/style-1.component.html
index 0e746cd6..a8299367 100644
--- a/src/app/layout/components/navbar/vertical/style-1/style-1.component.html
+++ b/src/app/layout/components/navbar/vertical/style-1/style-1.component.html
@@ -2,6 +2,7 @@
 
     <div class="logo">
         <img class="logo-icon" src="assets/images/logos/fuse.svg">
+        <span class="logo-text secondary-text">FUSE</span>
     </div>
 
     <div class="buttons">
diff --git a/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss b/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss
index 5629ca06..4099e475 100644
--- a/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss
+++ b/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss
@@ -23,6 +23,10 @@ fuse-sidebar {
                             width: 32px;
                             height: 32px;
                         }
+
+                        .logo-text {
+                            display: none;
+                        }
                     }
                 }
 
@@ -71,8 +75,15 @@ navbar {
             flex: 1 0 auto;
             align-items: center;
             justify-content: space-between;
+            min-height: 64px;
+            height: 64px;
             padding: 12px 12px 12px 20px;
 
+            @include media-breakpoint('xs') {
+                min-height: 56px;
+                height: 56px;
+            }
+
             .logo {
                 display: flex;
                 align-items: center;
@@ -81,6 +92,14 @@ navbar {
                     width: 24px;
                     height: 24px;
                 }
+
+                .logo-text {
+                    margin-left: 12px;
+                    font-size: 16px;
+                    font-weight: 300;
+                    letter-spacing: 0.4px;
+                    line-height: normal;
+                }
             }
 
             .buttons {
diff --git a/src/app/layout/components/navbar/vertical/style-1/style-1.component.ts b/src/app/layout/components/navbar/vertical/style-1/style-1.component.ts
index f6aeca04..acdc3238 100644
--- a/src/app/layout/components/navbar/vertical/style-1/style-1.component.ts
+++ b/src/app/layout/components/navbar/vertical/style-1/style-1.component.ts
@@ -81,7 +81,7 @@ export class NavbarVerticalStyle1Component implements OnInit, OnDestroy
                         {
                             const activeItemOffsetTop       = activeNavItem.offsetTop,
                                   activeItemOffsetParentTop = activeNavItem.offsetParent.offsetTop,
-                                  scrollDistance            = activeItemOffsetTop - activeItemOffsetParentTop - (48 * 3);
+                                  scrollDistance            = activeItemOffsetTop - activeItemOffsetParentTop - (48 * 3) - 168;
 
                             this._fusePerfectScrollbar.scrollToTop(scrollDistance);
                         }
diff --git a/src/app/layout/components/toolbar/toolbar.component.html b/src/app/layout/components/toolbar/toolbar.component.html
index 1607df5e..8399ad8a 100644
--- a/src/app/layout/components/toolbar/toolbar.component.html
+++ b/src/app/layout/components/toolbar/toolbar.component.html
@@ -30,8 +30,8 @@
             <button mat-button [matMenuTriggerFor]="userMenu"
                     class="user-button">
                 <div fxLayout="row" fxLayoutAlign="center center">
-                    <img class="avatar" src="assets/images/avatars/Velazquez.jpg">
-                    <span class="username mr-12" fxHide fxShow.gt-sm>John Doe</span>
+                    <img class="avatar mr-0 mr-sm-16" src="assets/images/avatars/Velazquez.jpg">
+                    <span class="username mr-12" fxHide fxShow.gt-sm>Charlie Adams</span>
                     <mat-icon class="s-16" fxHide.xs>keyboard_arrow_down</mat-icon>
                 </div>
             </button>