diff --git a/src/@fuse/scss/partials/_page-layouts.scss b/src/@fuse/scss/partials/_page-layouts.scss index a9d306a7..70e45445 100644 --- a/src/@fuse/scss/partials/_page-layouts.scss +++ b/src/@fuse/scss/partials/_page-layouts.scss @@ -48,7 +48,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too z-index: 2; padding: 0 32px; width: 100%; - min-width: 100%; + min-width: 0; max-width: 100%; max-height: 100%; @@ -244,6 +244,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too z-index: 3; margin-left: 32px; margin-right: 32px; + min-width: 0; > .header { display: flex; @@ -415,6 +416,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too > .content { flex: 1 1 auto; + min-width: 0; } } @@ -476,6 +478,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too flex-direction: column; flex: 1 1 auto; z-index: 3; + min-width: 0; @include mat-elevation(7); > .header { diff --git a/src/app/layout/components/content/content.component.ts b/src/app/layout/components/content/content.component.ts index e4cd9524..9e48689f 100644 --- a/src/app/layout/components/content/content.component.ts +++ b/src/app/layout/components/content/content.component.ts @@ -8,29 +8,29 @@ import { fuseAnimations } from '@fuse/animations'; import { FuseConfigService } from '@fuse/services/config.service'; @Component({ - selector : 'content', - templateUrl : './content.component.html', - styleUrls : ['./content.component.scss'], + selector: 'content', + templateUrl: './content.component.html', + styleUrls: ['./content.component.scss'], encapsulation: ViewEncapsulation.None, - animations : fuseAnimations + animations: fuseAnimations }) export class ContentComponent implements OnInit, OnDestroy { fuseConfig: any; - @HostBinding('@routerTransitionUp') + // @HostBinding('@routerTransitionUp') routeAnimationUp: boolean; - @HostBinding('@routerTransitionDown') + // @HostBinding('@routerTransitionDown') routeAnimationDown: boolean; - @HostBinding('@routerTransitionRight') + // @HostBinding('@routerTransitionRight') routeAnimationRight: boolean; - @HostBinding('@routerTransitionLeft') + // @HostBinding('@routerTransitionLeft') routeAnimationLeft: boolean; - @HostBinding('@routerTransitionFade') + // @HostBinding('@routerTransitionFade') routeAnimationFade: boolean; // Private @@ -75,8 +75,9 @@ export class ContentComponent implements OnInit, OnDestroy filter((event) => event instanceof NavigationEnd), map(() => this._activatedRoute) ) - .subscribe(() => { - switch ( this.fuseConfig.routerAnimation ) + .subscribe(() => + { + switch (this.fuseConfig.routerAnimation) { case 'fadeIn': this.routeAnimationFade = !this.routeAnimationFade; @@ -100,7 +101,8 @@ export class ContentComponent implements OnInit, OnDestroy this._fuseConfigService.config .pipe(takeUntil(this._unsubscribeAll)) .subscribe( - (config) => { + (config) => + { this.fuseConfig = config; } ); diff --git a/src/app/layout/horizontal/layout-1/layout-1.component.scss b/src/app/layout/horizontal/layout-1/layout-1.component.scss index bb3a3b3b..b92cdd75 100644 --- a/src/app/layout/horizontal/layout-1/layout-1.component.scss +++ b/src/app/layout/horizontal/layout-1/layout-1.component.scss @@ -26,7 +26,7 @@ horizontal-layout-1 { > .container { position: relative; display: flex; - flex: 1 1 auto; + flex: 1 1 0%; width: 100%; min-height: 0; min-width: 0; @@ -35,7 +35,7 @@ horizontal-layout-1 { > .container { position: relative; display: flex; - flex: 1 1 auto; + flex: 1 1 0%; flex-direction: column; min-width: 0; @@ -43,7 +43,7 @@ horizontal-layout-1 { > .container { position: relative; display: flex; - flex: 1 1 auto; + flex: 1 1 0%; flex-direction: column; transform: translateZ(0); overflow-x: hidden; @@ -53,11 +53,11 @@ horizontal-layout-1 { content { &.inner-scroll { - flex: 1 1 auto; + flex: 1 1 0%; min-height: 0; > *:not(router-outlet) { - flex: 1 1 auto; + flex: 1 1 0%; } } } diff --git a/src/app/layout/vertical/layout-1/layout-1.component.scss b/src/app/layout/vertical/layout-1/layout-1.component.scss index 91348554..e9d12711 100644 --- a/src/app/layout/vertical/layout-1/layout-1.component.scss +++ b/src/app/layout/vertical/layout-1/layout-1.component.scss @@ -26,7 +26,7 @@ vertical-layout-1 { > .container { position: relative; display: flex; - flex: 1 1 auto; + flex: 1 1 0%; width: 100%; min-height: 0; min-width: 0; @@ -35,7 +35,7 @@ vertical-layout-1 { > .container { position: relative; display: flex; - flex: 1 1 auto; + flex: 1 1 0%; flex-direction: column; min-width: 0; @@ -43,7 +43,7 @@ vertical-layout-1 { > .container { position: relative; display: flex; - flex: 1 1 auto; + flex: 1 1 0%; flex-direction: column; transform: translateZ(0); overflow-x: hidden; @@ -53,11 +53,11 @@ vertical-layout-1 { content { &.inner-scroll { - flex: 1 1 auto; + flex: 1 1 0%; min-height: 0; > *:not(router-outlet) { - flex: 1 1 auto; + flex: 1 1 0%; } } }