diff --git a/src/@fuse/scss/partials/_page-layouts.scss b/src/@fuse/scss/partials/_page-layouts.scss index 5749f8eb..8844b9a2 100644 --- a/src/@fuse/scss/partials/_page-layouts.scss +++ b/src/@fuse/scss/partials/_page-layouts.scss @@ -360,7 +360,6 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too overflow: auto; > .content { - display: flex; flex: 1 1 auto; } } 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 159fb15b..81a383e0 100644 --- a/src/app/main/ui/page-layouts/page-layouts.module.ts +++ b/src/app/main/ui/page-layouts/page-layouts.module.ts @@ -18,6 +18,7 @@ import { CardedRightSidebar2Component } from 'app/main/ui/page-layouts/carded/ri import { CardedRightSidebarTabbed1Component } from 'app/main/ui/page-layouts/carded/right-sidebar-tabbed-1/right-sidebar-tabbed-1.component'; import { CardedRightSidebarTabbed2Component } from 'app/main/ui/page-layouts/carded/right-sidebar-tabbed-2/right-sidebar-tabbed-2.component'; import { SimpleFullWidth1Component } from 'app/main/ui/page-layouts/simple/full-width-1/full-width-1.component'; +import { SimpleFullWidthTabbed1Component } from 'app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component'; import { SimpleLeftSidebar1Component } from 'app/main/ui/page-layouts/simple/left-sidebar-1/left-sidebar-1.component'; import { SimpleLeftSidebar2Component } from 'app/main/ui/page-layouts/simple/left-sidebar-2/left-sidebar-2.component'; import { SimpleLeftSidebar3Component } from 'app/main/ui/page-layouts/simple/left-sidebar-3/left-sidebar-3.component'; @@ -26,12 +27,12 @@ import { SimpleRightSidebar1Component } from 'app/main/ui/page-layouts/simple/ri import { SimpleRightSidebar2Component } from 'app/main/ui/page-layouts/simple/right-sidebar-2/right-sidebar-2.component'; import { SimpleRightSidebar3Component } from 'app/main/ui/page-layouts/simple/right-sidebar-3/right-sidebar-3.component'; import { SimpleRightSidebar4Component } from 'app/main/ui/page-layouts/simple/right-sidebar-4/right-sidebar-4.component'; -import { Tabbed1Component } from 'app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component'; import { BlankComponent } from 'app/main/ui/page-layouts/blank/blank.component'; import { FuseSidebarModule } from '@fuse/components'; const routes: Routes = [ + // Carded { path : 'page-layouts/carded/full-width-1', component: CardedFullWidth1Component @@ -80,10 +81,15 @@ const routes: Routes = [ path : 'page-layouts/carded/right-sidebar-tabbed-2', component: CardedRightSidebarTabbed2Component }, + // Simple { path : 'page-layouts/simple/full-width-1', component: SimpleFullWidth1Component }, + { + path : 'page-layouts/simple/full-width-tabbed-1', + component: SimpleFullWidthTabbed1Component + }, { path : 'page-layouts/simple/left-sidebar-1', component: SimpleLeftSidebar1Component @@ -116,10 +122,7 @@ const routes: Routes = [ path : 'page-layouts/simple/right-sidebar-4', component: SimpleRightSidebar4Component }, - { - path : 'page-layouts/simple/tabbed-1', - component: Tabbed1Component - }, + // Blank { path : 'page-layouts/blank', component: BlankComponent @@ -141,6 +144,7 @@ const routes: Routes = [ CardedRightSidebarTabbed1Component, CardedRightSidebarTabbed2Component, SimpleFullWidth1Component, + SimpleFullWidthTabbed1Component, SimpleLeftSidebar1Component, SimpleLeftSidebar2Component, SimpleLeftSidebar3Component, @@ -149,7 +153,6 @@ const routes: Routes = [ SimpleRightSidebar2Component, SimpleRightSidebar3Component, SimpleRightSidebar4Component, - Tabbed1Component, BlankComponent ], imports : [ diff --git a/src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.html b/src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.html similarity index 100% rename from src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.html rename to src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.html diff --git a/src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.scss b/src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.scss similarity index 100% rename from src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.scss rename to src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.scss diff --git a/src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.ts b/src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.ts new file mode 100644 index 00000000..929abb3e --- /dev/null +++ b/src/app/main/ui/page-layouts/simple/full-width-tabbed-1/full-width-tabbed-1.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + +@Component({ + selector : 'simple-full-width-tabbed-1', + templateUrl: './full-width-tabbed-1.component.html', + styleUrls : ['./full-width-tabbed-1.component.scss'] +}) +export class SimpleFullWidthTabbed1Component +{ + /** + * Constructor + */ + constructor() + { + } + +} diff --git a/src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.ts b/src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.ts deleted file mode 100644 index f5039dde..00000000 --- a/src/app/main/ui/page-layouts/simple/tabbed-1/tabbed-1.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector : 'tabbed-1', - templateUrl: './tabbed-1.component.html', - styleUrls : ['./tabbed-1.component.scss'] -}) -export class Tabbed1Component -{ - /** - * Constructor - */ - constructor() - { - } - -} diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index d69b250f..b0bdc584 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -497,6 +497,12 @@ export const navigation: FuseNavigation[] = [ type : 'item', url : '/ui/page-layouts/simple/full-width-1' }, + { + id : 'full-width-tabbed-1', + title: 'Full Width Tabbed #1', + type : 'item', + url : '/ui/page-layouts/simple/full-width-tabbed-1' + }, { id : 'left-sidebar-1', title: 'Left Sidebar #1',