Merge remote-tracking branch 'origin/master'

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',

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";

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;
+    }
+}

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>

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
 {
 }

src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html

@@ -52,5 +52,6 @@
         </div>
 
     </div>
+
 </div>
 <!-- / SIDENAV CONTENT -->

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 {