From 4d4d52ba0547d5fbe2c57c12561682862a36e411 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 12 Jul 2018 15:48:55 +0300
Subject: [PATCH] (Navbar) Fixed: Style variant 2 doesn't scroll on Firefox, IE
 & Edge (Chat Panel) Fixed: Doesn't scroll on Firefox, IE & Edge Increased
 Fuse version

---
 package-lock.json                                             | 2 +-
 package.json                                                  | 2 +-
 .../layout/components/chat-panel/chat-panel.component.html    | 2 +-
 .../layout/components/chat-panel/chat-panel.component.scss    | 4 ++++
 src/app/layout/components/navbar/navbar.component.scss        | 1 +
 .../components/navbar/vertical/style-1/style-1.component.scss | 2 ++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2684398b..81f93b5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index aad07bb5..9228826c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuse",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "license": "https://themeforest.net/licenses/terms/regular",
   "scripts": {
     "ng": "ng",
diff --git a/src/app/layout/components/chat-panel/chat-panel.component.html b/src/app/layout/components/chat-panel/chat-panel.component.html
index 84b4ee42..eab3cb96 100644
--- a/src/app/layout/components/chat-panel/chat-panel.component.html
+++ b/src/app/layout/components/chat-panel/chat-panel.component.html
@@ -28,7 +28,7 @@
 
 </div>
 
-<div>
+<div class="content">
 
     <!-- Contacts -->
     <div id="contacts-list" fusePerfectScrollbar [fusePerfectScrollbarOptions]="{suppressScrollX: true}">
diff --git a/src/app/layout/components/chat-panel/chat-panel.component.scss b/src/app/layout/components/chat-panel/chat-panel.component.scss
index 9676ba32..91531744 100644
--- a/src/app/layout/components/chat-panel/chat-panel.component.scss
+++ b/src/app/layout/components/chat-panel/chat-panel.component.scss
@@ -34,6 +34,10 @@ chat-panel {
 
     }
 
+    .content {
+        min-height: 0;
+    }
+
     #contacts-list {
         padding: 8px 0;
         overflow: auto;
diff --git a/src/app/layout/components/navbar/navbar.component.scss b/src/app/layout/components/navbar/navbar.component.scss
index 44ede0d8..e14eee3b 100644
--- a/src/app/layout/components/navbar/navbar.component.scss
+++ b/src/app/layout/components/navbar/navbar.component.scss
@@ -3,4 +3,5 @@ navbar {
     flex-direction: column;
     flex: 1 1 auto;
     width: 100%;
+    height: 100%;
 }
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 147859a9..9bd0d98d 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
@@ -79,11 +79,13 @@ navbar {
             align-items: center;
             justify-content: space-between;
             min-height: 64px;
+            max-height: 64px;
             height: 64px;
             padding: 12px 12px 12px 20px;
 
             @include media-breakpoint('xs') {
                 min-height: 56px;
+                max-height: 56px;
                 height: 56px;
             }