From 3541d689940ea9d324454272da559ca404241676 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Wed, 26 Jul 2017 13:58:55 +0300
Subject: [PATCH] mail sidenav scroll issue + toolbar separator global class +
 renamed MailModule to FuseMailModule

---
 src/app/app.module.ts                                    | 2 +-
 src/app/core/scss/core.scss                              | 1 +
 src/app/core/scss/partials/_toolbar.scss                 | 9 +++++++++
 src/app/main/apps/mail/mail.component.html               | 2 ++
 src/app/main/apps/mail/mail.module.ts                    | 8 ++++----
 .../apps/mail/sidenavs/main/main-sidenav.component.html  | 1 +
 .../apps/mail/sidenavs/main/main-sidenav.component.scss  | 5 +++++
 7 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 src/app/core/scss/partials/_toolbar.scss

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 14c2b109..6c28fef6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -29,7 +29,7 @@ const PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
 const appRoutes: Routes = [
     {
         path        : 'apps/mail',
-        loadChildren: './main/apps/mail/mail.module#MailModule'
+        loadChildren: './main/apps/mail/mail.module#FuseMailModule'
     },
     {
         path        : 'apps/chat',
diff --git a/src/app/core/scss/core.scss b/src/app/core/scss/core.scss
index 31b2ae0f..c68ca411 100644
--- a/src/app/core/scss/core.scss
+++ b/src/app/core/scss/core.scss
@@ -37,6 +37,7 @@
 @import "partials/page-layouts";
 @import "partials/navigation";
 @import "partials/forms";
+@import "partials/toolbar";
 
 // Plugins
 @import "partials/plugins/plugins";
diff --git a/src/app/core/scss/partials/_toolbar.scss b/src/app/core/scss/partials/_toolbar.scss
new file mode 100644
index 00000000..25b6e615
--- /dev/null
+++ b/src/app/core/scss/partials/_toolbar.scss
@@ -0,0 +1,9 @@
+.toolbar {
+
+    .toolbar-separator {
+        height: calc(100% - 16px);
+        width: 1px;
+        border-right: 1px solid rgba(0, 0, 0, 0.12);
+        margin: 0 12px;
+    }
+}
\ No newline at end of file
diff --git a/src/app/main/apps/mail/mail.component.html b/src/app/main/apps/mail/mail.component.html
index f31dab6f..3ed65737 100644
--- a/src/app/main/apps/mail/mail.component.html
+++ b/src/app/main/apps/mail/mail.component.html
@@ -59,6 +59,8 @@
                         <button md-menu-item (click)="selectMails('important', false)">Unimportant</button>
                     </md-menu>
 
+                    <div class="toolbar-separator" *ngIf="hasSelectedMails"></div>
+
                     <button md-icon-button (click)="setFolderOnSelectedMails(4)" *ngIf="hasSelectedMails">
                         <md-icon>delete</md-icon>
                     </button>
diff --git a/src/app/main/apps/mail/mail.module.ts b/src/app/main/apps/mail/mail.module.ts
index 9c84d998..871536c3 100644
--- a/src/app/main/apps/mail/mail.module.ts
+++ b/src/app/main/apps/mail/mail.module.ts
@@ -53,17 +53,17 @@ const routes: Routes = [
     },
     {
         path      : '**',
-        redirectTo: 'folder/inbox'
+        redirectTo: 'inbox'
     }
 ];
 
 @NgModule({
     declarations: [
         MailComponent,
-        MainSidenavComponent,
         MailListComponent,
         MailListItemComponent,
-        MailDetailsComponent
+        MailDetailsComponent,
+        MainSidenavComponent
     ],
     imports     : [
         SharedModule,
@@ -73,6 +73,6 @@ const routes: Routes = [
         MailService
     ]
 })
-export class MailModule
+export class FuseMailModule
 {
 }
diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
index 09102a6f..2d0aaf5b 100644
--- a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -52,5 +52,6 @@
         </div>
 
     </div>
+
 </div>
 <!-- / SIDENAV CONTENT -->
\ No newline at end of file
diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss
index 70066f87..4e646178 100644
--- a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss
+++ b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss
@@ -1,4 +1,9 @@
 :host {
+    display: flex;
+    flex: 1 0 auto;
+    flex-direction: column;
+    height: 100%;
+
     .header {
 
         .logo {