diff --git a/src/app/core/components/navigation/navigation.model.ts b/src/app/core/components/navigation/navigation.model.ts index 2a11d038..9128bea2 100644 --- a/src/app/core/components/navigation/navigation.model.ts +++ b/src/app/core/components/navigation/navigation.model.ts @@ -312,6 +312,11 @@ export class FuseNavigation 'type' : 'nav-item', 'url' : '/ui/page-layouts/simple/left-sidenav-2' }, + { + 'title': 'Left Sidenav 3', + 'type' : 'nav-item', + 'url' : '/ui/page-layouts/simple/left-sidenav-3' + }, { 'title': 'Right Sidenav', 'type' : 'nav-item', diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss index 5d0db16a..d59da5b5 100644 --- a/src/app/core/scss/partials/_page-layouts.scss +++ b/src/app/core/scss/partials/_page-layouts.scss @@ -280,6 +280,10 @@ $card-header-height-sm: $header-height-sm - $card-toolbar-height; } > md-sidenav-container { + display: flex; + background: none; + z-index: 2; + width: 100%; .sidenav { width: 240px; @@ -305,6 +309,7 @@ $card-header-height-sm: $header-height-sm - $card-toolbar-height; } .mat-sidenav-content { + flex: 1; overflow: visible; .header { diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html index ca052e35..d387bc1f 100644 --- a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html @@ -6,25 +6,6 @@ - - - - -
-

Sidenav header

-
- - - -
- -
- - -
- -
@@ -63,6 +44,25 @@
+ + + + +
+

Sidenav header

+
+ + + +
+ +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html index df12b273..f9ac1131 100644 --- a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html +++ b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html @@ -6,25 +6,6 @@ - - - - -
-

Sidenav header

-
- - - -
- -
- - -
- -
@@ -63,6 +44,25 @@
+ + + + +
+

Sidenav header

+
+ + + +
+ +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/main/ui/page-layouts/page-layouts.module.ts b/src/app/main/ui/page-layouts/page-layouts.module.ts index 95696fe7..23faa3aa 100644 --- a/src/app/main/ui/page-layouts/page-layouts.module.ts +++ b/src/app/main/ui/page-layouts/page-layouts.module.ts @@ -15,6 +15,7 @@ import { SimpleRightSidenavComponent } from './simple/right-sidenav/right-sidena import { SimpleRightSidenav2Component } from './simple/right-sidenav-2/right-sidenav-2.component'; import { TabbedComponent } from './simple/tabbed/tabbed.component'; import { BlankComponent } from './blank/blank.component'; +import { SimpleLeftSidenav3Component } from './simple/left-sidenav-3/left-sidenav-3.component'; const routes: Routes = [ { @@ -53,6 +54,10 @@ const routes: Routes = [ path : 'ui/page-layouts/simple/left-sidenav-2', component: SimpleLeftSidenav2Component }, + { + path : 'ui/page-layouts/simple/left-sidenav-3', + component: SimpleLeftSidenav3Component + }, { path : 'ui/page-layouts/simple/right-sidenav', component: SimpleRightSidenavComponent @@ -61,6 +66,10 @@ const routes: Routes = [ path : 'ui/page-layouts/simple/right-sidenav-2', component: SimpleRightSidenav2Component }, + /*{ + path : 'ui/page-layouts/simple/right-sidenav-3', + component: SimpleRightSidenav3Component + },*/ { path : 'ui/page-layouts/simple/tabbed', component: TabbedComponent @@ -87,6 +96,7 @@ const routes: Routes = [ SimpleFullWidthComponent, SimpleLeftSidenavComponent, SimpleLeftSidenav2Component, + SimpleLeftSidenav3Component, SimpleRightSidenavComponent, SimpleRightSidenav2Component, TabbedComponent, diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html new file mode 100644 index 00000000..c018bf5b --- /dev/null +++ b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html @@ -0,0 +1,46 @@ +
+ + +
+ + + +
+

Left inner sidenav with content scroll

+
+ +
+ + + + + + + + + + + + + +
+ + +
+ + + +
+ + +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts new file mode 100644 index 00000000..8d4afff9 --- /dev/null +++ b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; + +@Component({ + selector : 'fuse-simple-left-sidenav-3', + templateUrl: './left-sidenav-3.component.html', + styleUrls : ['./left-sidenav-3.component.scss'] +}) +export class SimpleLeftSidenav3Component +{ + constructor() + { + } + +} diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html index eb9357ea..e8bce97f 100644 --- a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html @@ -2,15 +2,6 @@ - - - - - - - -
@@ -41,6 +32,15 @@
+ + + + + + + +
\ No newline at end of file diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html index 1b264f17..5a4cd662 100644 --- a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html +++ b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html @@ -2,15 +2,6 @@ - - - - - - - -
@@ -41,6 +32,15 @@
+ + + + + + + +
\ No newline at end of file