(Page Layouts) Renamed simple "Tabbed" layout to "Full Width Tabbed" + small style tweak

This commit is contained in:
Sercan Yemen 2018-06-10 20:25:27 +03:00
parent 86815b7737
commit e79bfb7bce
7 changed files with 32 additions and 24 deletions

View File

@ -360,7 +360,6 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
overflow: auto; overflow: auto;
> .content { > .content {
display: flex;
flex: 1 1 auto; flex: 1 1 auto;
} }
} }

View File

@ -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 { 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 { 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 { 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 { 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 { 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'; 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 { 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 { 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 { 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 { BlankComponent } from 'app/main/ui/page-layouts/blank/blank.component';
import { FuseSidebarModule } from '@fuse/components'; import { FuseSidebarModule } from '@fuse/components';
const routes: Routes = [ const routes: Routes = [
// Carded
{ {
path : 'page-layouts/carded/full-width-1', path : 'page-layouts/carded/full-width-1',
component: CardedFullWidth1Component component: CardedFullWidth1Component
@ -80,10 +81,15 @@ const routes: Routes = [
path : 'page-layouts/carded/right-sidebar-tabbed-2', path : 'page-layouts/carded/right-sidebar-tabbed-2',
component: CardedRightSidebarTabbed2Component component: CardedRightSidebarTabbed2Component
}, },
// Simple
{ {
path : 'page-layouts/simple/full-width-1', path : 'page-layouts/simple/full-width-1',
component: SimpleFullWidth1Component component: SimpleFullWidth1Component
}, },
{
path : 'page-layouts/simple/full-width-tabbed-1',
component: SimpleFullWidthTabbed1Component
},
{ {
path : 'page-layouts/simple/left-sidebar-1', path : 'page-layouts/simple/left-sidebar-1',
component: SimpleLeftSidebar1Component component: SimpleLeftSidebar1Component
@ -116,10 +122,7 @@ const routes: Routes = [
path : 'page-layouts/simple/right-sidebar-4', path : 'page-layouts/simple/right-sidebar-4',
component: SimpleRightSidebar4Component component: SimpleRightSidebar4Component
}, },
{ // Blank
path : 'page-layouts/simple/tabbed-1',
component: Tabbed1Component
},
{ {
path : 'page-layouts/blank', path : 'page-layouts/blank',
component: BlankComponent component: BlankComponent
@ -141,6 +144,7 @@ const routes: Routes = [
CardedRightSidebarTabbed1Component, CardedRightSidebarTabbed1Component,
CardedRightSidebarTabbed2Component, CardedRightSidebarTabbed2Component,
SimpleFullWidth1Component, SimpleFullWidth1Component,
SimpleFullWidthTabbed1Component,
SimpleLeftSidebar1Component, SimpleLeftSidebar1Component,
SimpleLeftSidebar2Component, SimpleLeftSidebar2Component,
SimpleLeftSidebar3Component, SimpleLeftSidebar3Component,
@ -149,7 +153,6 @@ const routes: Routes = [
SimpleRightSidebar2Component, SimpleRightSidebar2Component,
SimpleRightSidebar3Component, SimpleRightSidebar3Component,
SimpleRightSidebar4Component, SimpleRightSidebar4Component,
Tabbed1Component,
BlankComponent BlankComponent
], ],
imports : [ imports : [

View File

@ -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()
{
}
}

View File

@ -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()
{
}
}

View File

@ -497,6 +497,12 @@ export const navigation: FuseNavigation[] = [
type : 'item', type : 'item',
url : '/ui/page-layouts/simple/full-width-1' 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', id : 'left-sidebar-1',
title: 'Left Sidebar #1', title: 'Left Sidebar #1',